You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/08/16 14:48:03 UTC

[01/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site afca75aaa -> f3d62514e


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
index ee05a1d..06f2ffa 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
@@ -138,1307 +138,1310 @@
 <span class="sourceLineNo">130</span>  private Path OLDLOGDIR;<a name="line.130"></a>
 <span class="sourceLineNo">131</span>  private Path CORRUPTDIR;<a name="line.131"></a>
 <span class="sourceLineNo">132</span>  private Path TABLEDIR;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  private static final int NUM_WRITERS = 10;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private static final int ENTRIES = 10; // entries per writer per region<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private static final String FILENAME_BEING_SPLIT = "testfile";<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  private static final TableName TABLE_NAME =<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      TableName.valueOf("t1");<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  private static final byte[] FAMILY = Bytes.toBytes("f1");<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private static final byte[] QUALIFIER = Bytes.toBytes("q1");<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private static final byte[] VALUE = Bytes.toBytes("v1");<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  private static final String WAL_FILE_PREFIX = "wal.dat.";<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static List&lt;String&gt; REGIONS = new ArrayList&lt;&gt;();<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  private static final String HBASE_SKIP_ERRORS = "hbase.hlog.split.skip.errors";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private static String ROBBER;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  private static String ZOMBIE;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  private static String [] GROUP = new String [] {"supergroup"};<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>  static enum Corruptions {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    INSERT_GARBAGE_ON_FIRST_LINE,<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    INSERT_GARBAGE_IN_THE_MIDDLE,<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    APPEND_GARBAGE,<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    TRUNCATE,<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    TRUNCATE_TRAILER<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>  @BeforeClass<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  public static void setUpBeforeClass() throws Exception {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    conf = TEST_UTIL.getConfiguration();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    conf.setClass("hbase.regionserver.hlog.writer.impl",<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        InstrumentedLogWriter.class, Writer.class);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    // This is how you turn off shortcircuit read currently.  TODO: Fix.  Should read config.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    System.setProperty("hbase.tests.use.shortcircuit.reads", "false");<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    // Create fake maping user to group and set it to the conf.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    Map&lt;String, String []&gt; u2g_map = new HashMap&lt;&gt;(2);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    ROBBER = User.getCurrent().getName() + "-robber";<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    ZOMBIE = User.getCurrent().getName() + "-zombie";<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    u2g_map.put(ROBBER, GROUP);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    u2g_map.put(ZOMBIE, GROUP);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    DFSTestUtil.updateConfWithFakeGroupMapping(conf, u2g_map);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    conf.setInt("dfs.heartbeat.interval", 1);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    TEST_UTIL.startMiniDFSCluster(2);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @AfterClass<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public static void tearDownAfterClass() throws Exception {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    TEST_UTIL.shutdownMiniDFSCluster();<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>  @Rule<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public TestName name = new TestName();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  private WALFactory wals = null;<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  @Before<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public void setUp() throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    LOG.info("Cleaning up cluster for new test.");<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    fs = TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    HBASEDIR = TEST_UTIL.createRootDir();<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    HBASELOGDIR = TEST_UTIL.createWALRootDir();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    OLDLOGDIR = new Path(HBASELOGDIR, HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    CORRUPTDIR = new Path(HBASELOGDIR, HConstants.CORRUPT_DIR_NAME);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    TABLEDIR = FSUtils.getTableDir(HBASEDIR, TABLE_NAME);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    REGIONS.clear();<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    Collections.addAll(REGIONS, "bbb", "ccc");<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    InstrumentedLogWriter.activateFailure = false;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    wals = new WALFactory(conf, name.getMethodName());<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    WALDIR = new Path(HBASELOGDIR,<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        AbstractFSWALProvider.getWALDirectoryName(ServerName.valueOf(name.getMethodName(),<a name="line.199"></a>
-<span class="sourceLineNo">200</span>            16010, System.currentTimeMillis()).toString()));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    //fs.mkdirs(WALDIR);<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>  @After<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  public void tearDown() throws Exception {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    try {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      wals.close();<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    } catch(IOException exception) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      // Some tests will move WALs out from under us. In those cases, we'll get an error on close.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      LOG.info("Ignoring an error while closing down our WALFactory. Fine for some tests, but if" +<a name="line.210"></a>
-<span class="sourceLineNo">211</span>          " you see a failure look here.");<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      LOG.debug("exception details", exception);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    } finally {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      wals = null;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      fs.delete(HBASEDIR, true);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      fs.delete(HBASELOGDIR, true);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<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>   * Simulates splitting a WAL out from under a regionserver that is still trying to write it.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * Ensures we do not lose edits.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * @throws IOException<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   * @throws InterruptedException<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  @Test<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // Region we'll write edits too and then later examine to make sure they all made it in.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    final String region = REGIONS.get(0);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    final int numWriters = 3;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Thread zombie = new ZombieLastLogWriterRegionServer(counter, stop, region, numWriters);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    try {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      long startCount = counter.get();<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      zombie.start();<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      // Wait till writer starts going.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      while (startCount == counter.get()) Threads.sleep(1);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      // Give it a second to write a few appends.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      Threads.sleep(1000);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      final Configuration conf2 = HBaseConfiguration.create(conf);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      final User robber = User.createUserForTesting(conf2, ROBBER, GROUP);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      int count = robber.runAs(new PrivilegedExceptionAction&lt;Integer&gt;() {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        @Override<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        public Integer run() throws Exception {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>          StringBuilder ls = new StringBuilder("Contents of WALDIR (").append(WALDIR)<a name="line.246"></a>
-<span class="sourceLineNo">247</span>              .append("):\n");<a name="line.247"></a>
-<span class="sourceLineNo">248</span>          for (FileStatus status : fs.listStatus(WALDIR)) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>            ls.append("\t").append(status.toString()).append("\n");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>          LOG.debug(Objects.toString(ls));<a name="line.251"></a>
-<span class="sourceLineNo">252</span>          LOG.info("Splitting WALs out from under zombie. Expecting " + numWriters + " files.");<a name="line.252"></a>
-<span class="sourceLineNo">253</span>          WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf2, wals);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>          LOG.info("Finished splitting out from under zombie.");<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>          assertEquals("wrong number of split files for region", numWriters, logfiles.length);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          int count = 0;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          for (Path logfile: logfiles) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            count += countWAL(logfile);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>          }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>          return count;<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      });<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      LOG.info("zombie=" + counter.get() + ", robber=" + count);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      assertTrue("The log file could have at most 1 extra log entry, but can't have less. " +<a name="line.265"></a>
-<span class="sourceLineNo">266</span>              "Zombie could write " + counter.get() + " and logfile had only " + count,<a name="line.266"></a>
-<span class="sourceLineNo">267</span>          counter.get() == count || counter.get() + 1 == count);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    } finally {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      stop.set(true);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      zombie.interrupt();<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Threads.threadDumpingIsAlive(zombie);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    }<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>  /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * This thread will keep writing to a 'wal' file even after the split process has started.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   * It simulates a region server that was considered dead but woke up and wrote some more to the<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   * last log entry. Does its writing as an alternate user in another filesystem instance to<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * simulate better it being a regionserver.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   */<a name="line.280"></a>
-<span class="sourceLineNo">281</span>  class ZombieLastLogWriterRegionServer extends Thread {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    final AtomicLong editsCount;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    final AtomicBoolean stop;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    final int numOfWriters;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span>     * Region to write edits for.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>     */<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    final String region;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    final User user;<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    public ZombieLastLogWriterRegionServer(AtomicLong counter, AtomicBoolean stop,<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        final String region, final int writers)<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        throws IOException, InterruptedException {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      super("ZombieLastLogWriterRegionServer");<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      setDaemon(true);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      this.stop = stop;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      this.editsCount = counter;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      this.region = region;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      this.user = User.createUserForTesting(conf, ZOMBIE, GROUP);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      numOfWriters = writers;<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>
-<span class="sourceLineNo">303</span>    @Override<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    public void run() {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        doWriting();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      } catch (IOException e) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        LOG.warn(getName() + " Writer exiting " + e);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } catch (InterruptedException e) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        LOG.warn(getName() + " Writer exiting " + e);<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><a name="line.313"></a>
-<span class="sourceLineNo">314</span>    private void doWriting() throws IOException, InterruptedException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      this.user.runAs(new PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        @Override<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        public Object run() throws Exception {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          // Index of the WAL we want to keep open.  generateWALs will leave open the WAL whose<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          // index we supply here.<a name="line.319"></a>
-<span class="sourceLineNo">320</span>          int walToKeepOpen = numOfWriters - 1;<a name="line.320"></a>
-<span class="sourceLineNo">321</span>          // The below method writes numOfWriters files each with ENTRIES entries for a total of<a name="line.321"></a>
-<span class="sourceLineNo">322</span>          // numOfWriters * ENTRIES added per column family in the region.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>          Writer writer = null;<a name="line.323"></a>
-<span class="sourceLineNo">324</span>          try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>            writer = generateWALs(numOfWriters, ENTRIES, walToKeepOpen);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>          } catch (IOException e1) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>            throw new RuntimeException("Failed", e1);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>          }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>          // Update counter so has all edits written so far.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>          editsCount.addAndGet(numOfWriters * ENTRIES);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>          loop(writer);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>          // If we've been interruped, then things should have shifted out from under us.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>          // closing should error<a name="line.333"></a>
-<span class="sourceLineNo">334</span>          try {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>            writer.close();<a name="line.335"></a>
-<span class="sourceLineNo">336</span>            fail("Writing closing after parsing should give an error.");<a name="line.336"></a>
-<span class="sourceLineNo">337</span>          } catch (IOException exception) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>            LOG.debug("ignoring error when closing final writer.", exception);<a name="line.338"></a>
-<span class="sourceLineNo">339</span>          }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>          return null;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      });<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>    private void loop(final Writer writer) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      byte [] regionBytes = Bytes.toBytes(this.region);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      while (!stop.get()) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        try {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>          long seq = appendEntry(writer, TABLE_NAME, regionBytes,<a name="line.349"></a>
-<span class="sourceLineNo">350</span>              Bytes.toBytes("r" + editsCount.get()), regionBytes, QUALIFIER, VALUE, 0);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          long count = editsCount.incrementAndGet();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>          LOG.info(getName() + " sync count=" + count + ", seq=" + seq);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          try {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            Thread.sleep(1);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>          } catch (InterruptedException e) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            //<a name="line.356"></a>
-<span class="sourceLineNo">357</span>          }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>        } catch (IOException ex) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          LOG.error(getName() + " ex " + ex.toString());<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (ex instanceof RemoteException) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            LOG.error("Juliet: got RemoteException " + ex.getMessage() +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                " while writing " + (editsCount.get() + 1));<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          } else {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>            LOG.error(getName() + " failed to write....at " + editsCount.get());<a name="line.364"></a>
-<span class="sourceLineNo">365</span>            fail("Failed to write " + editsCount.get());<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          }<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          break;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>        } catch (Throwable t) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          LOG.error(getName() + " HOW? " + t);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>          LOG.debug("exception details", t);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          break;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      LOG.info(getName() + " Writer exiting");<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><a name="line.377"></a>
-<span class="sourceLineNo">378</span>  /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  @Test<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    Path regiondir = new Path(tdir,<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    fs.mkdirs(regiondir);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    long now = System.currentTimeMillis();<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    Entry entry =<a name="line.389"></a>
-<span class="sourceLineNo">390</span>        new Entry(new WALKeyImpl(encoded,<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            new WALEdit());<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        FILENAME_BEING_SPLIT, conf);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.396"></a>
-<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>  /**<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   * This is useful in upgrading old instances.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   */<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  @Test<a name="line.403"></a>
-<span class="sourceLineNo">404</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    Path regiondir = new Path(tdir,<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    fs.mkdirs(regiondir);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    long now = System.currentTimeMillis();<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    Entry entry =<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        new Entry(new WALKeyImpl(encoded,<a name="line.412"></a>
-<span class="sourceLineNo">413</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.413"></a>
-<span class="sourceLineNo">414</span>            new WALEdit());<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    Path parent = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    assertEquals(HConstants.RECOVERED_EDITS_DIR, parent.getName());<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    fs.createNewFile(parent); // create a recovered.edits file<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        FILENAME_BEING_SPLIT, conf);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    WALFactory.createRecoveredEditsWriter(fs, p, conf).close();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span>  private void useDifferentDFSClient() throws IOException {<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    // make fs act as a different client now<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    // initialize will create a new DFSClient with a new client ID<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    fs.initialize(fs.getUri(), conf);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  @Test<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    final String REGION = "region__1";<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    REGIONS.clear();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    REGIONS.add(REGION);<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>    generateWALs(1, 10, -1, 0);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    useDifferentDFSClient();<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    assertEquals(1, splitLog.length);<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
+<span class="sourceLineNo">133</span>  private String TMPDIRNAME;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  private static final int NUM_WRITERS = 10;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private static final int ENTRIES = 10; // entries per writer per region<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private static final String FILENAME_BEING_SPLIT = "testfile";<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  private static final TableName TABLE_NAME =<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      TableName.valueOf("t1");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  private static final byte[] FAMILY = Bytes.toBytes("f1");<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private static final byte[] QUALIFIER = Bytes.toBytes("q1");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  private static final byte[] VALUE = Bytes.toBytes("v1");<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  private static final String WAL_FILE_PREFIX = "wal.dat.";<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static List&lt;String&gt; REGIONS = new ArrayList&lt;&gt;();<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static final String HBASE_SKIP_ERRORS = "hbase.hlog.split.skip.errors";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private static String ROBBER;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  private static String ZOMBIE;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  private static String [] GROUP = new String [] {"supergroup"};<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>  static enum Corruptions {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    INSERT_GARBAGE_ON_FIRST_LINE,<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    INSERT_GARBAGE_IN_THE_MIDDLE,<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    APPEND_GARBAGE,<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    TRUNCATE,<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    TRUNCATE_TRAILER<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>  @BeforeClass<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public static void setUpBeforeClass() throws Exception {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    conf = TEST_UTIL.getConfiguration();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    conf.setClass("hbase.regionserver.hlog.writer.impl",<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        InstrumentedLogWriter.class, Writer.class);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    // This is how you turn off shortcircuit read currently.  TODO: Fix.  Should read config.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    System.setProperty("hbase.tests.use.shortcircuit.reads", "false");<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    // Create fake maping user to group and set it to the conf.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    Map&lt;String, String []&gt; u2g_map = new HashMap&lt;&gt;(2);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    ROBBER = User.getCurrent().getName() + "-robber";<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    ZOMBIE = User.getCurrent().getName() + "-zombie";<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    u2g_map.put(ROBBER, GROUP);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    u2g_map.put(ZOMBIE, GROUP);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    DFSTestUtil.updateConfWithFakeGroupMapping(conf, u2g_map);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    conf.setInt("dfs.heartbeat.interval", 1);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    TEST_UTIL.startMiniDFSCluster(2);<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>  @AfterClass<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  public static void tearDownAfterClass() throws Exception {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    TEST_UTIL.shutdownMiniDFSCluster();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>  @Rule<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  public TestName name = new TestName();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  private WALFactory wals = null;<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  @Before<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  public void setUp() throws Exception {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    LOG.info("Cleaning up cluster for new test.");<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    fs = TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    HBASEDIR = TEST_UTIL.createRootDir();<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    HBASELOGDIR = TEST_UTIL.createWALRootDir();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    OLDLOGDIR = new Path(HBASELOGDIR, HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    CORRUPTDIR = new Path(HBASELOGDIR, HConstants.CORRUPT_DIR_NAME);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    TABLEDIR = FSUtils.getTableDir(HBASEDIR, TABLE_NAME);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    TMPDIRNAME = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    REGIONS.clear();<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    Collections.addAll(REGIONS, "bbb", "ccc");<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    InstrumentedLogWriter.activateFailure = false;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    wals = new WALFactory(conf, name.getMethodName());<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    WALDIR = new Path(HBASELOGDIR,<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        AbstractFSWALProvider.getWALDirectoryName(ServerName.valueOf(name.getMethodName(),<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            16010, System.currentTimeMillis()).toString()));<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    //fs.mkdirs(WALDIR);<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>  @After<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  public void tearDown() throws Exception {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    try {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      wals.close();<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    } catch(IOException exception) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      // Some tests will move WALs out from under us. In those cases, we'll get an error on close.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      LOG.info("Ignoring an error while closing down our WALFactory. Fine for some tests, but if" +<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          " you see a failure look here.");<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      LOG.debug("exception details", exception);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    } finally {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      wals = null;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      fs.delete(HBASEDIR, true);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      fs.delete(HBASELOGDIR, true);<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><a name="line.222"></a>
+<span class="sourceLineNo">223</span>  /**<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   * Simulates splitting a WAL out from under a regionserver that is still trying to write it.<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * Ensures we do not lose edits.<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * @throws IOException<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * @throws InterruptedException<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   */<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  @Test<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // Region we'll write edits too and then later examine to make sure they all made it in.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    final String region = REGIONS.get(0);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    final int numWriters = 3;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    Thread zombie = new ZombieLastLogWriterRegionServer(counter, stop, region, numWriters);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      long startCount = counter.get();<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      zombie.start();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      // Wait till writer starts going.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      while (startCount == counter.get()) Threads.sleep(1);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      // Give it a second to write a few appends.<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      Threads.sleep(1000);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      final Configuration conf2 = HBaseConfiguration.create(conf);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      final User robber = User.createUserForTesting(conf2, ROBBER, GROUP);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      int count = robber.runAs(new PrivilegedExceptionAction&lt;Integer&gt;() {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        public Integer run() throws Exception {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>          StringBuilder ls = new StringBuilder("Contents of WALDIR (").append(WALDIR)<a name="line.249"></a>
+<span class="sourceLineNo">250</span>              .append("):\n");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>          for (FileStatus status : fs.listStatus(WALDIR)) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>            ls.append("\t").append(status.toString()).append("\n");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>          }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>          LOG.debug(Objects.toString(ls));<a name="line.254"></a>
+<span class="sourceLineNo">255</span>          LOG.info("Splitting WALs out from under zombie. Expecting " + numWriters + " files.");<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf2, wals);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>          LOG.info("Finished splitting out from under zombie.");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>          Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>          assertEquals("wrong number of split files for region", numWriters, logfiles.length);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>          int count = 0;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>          for (Path logfile: logfiles) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>            count += countWAL(logfile);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>          }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>          return count;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>        }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      });<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      LOG.info("zombie=" + counter.get() + ", robber=" + count);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      assertTrue("The log file could have at most 1 extra log entry, but can't have less. " +<a name="line.268"></a>
+<span class="sourceLineNo">269</span>              "Zombie could write " + counter.get() + " and logfile had only " + count,<a name="line.269"></a>
+<span class="sourceLineNo">270</span>          counter.get() == count || counter.get() + 1 == count);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    } finally {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      stop.set(true);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      zombie.interrupt();<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      Threads.threadDumpingIsAlive(zombie);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>  /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   * This thread will keep writing to a 'wal' file even after the split process has started.<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   * It simulates a region server that was considered dead but woke up and wrote some more to the<a name="line.280"></a>
+<span class="sourceLineNo">281</span>   * last log entry. Does its writing as an alternate user in another filesystem instance to<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * simulate better it being a regionserver.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  class ZombieLastLogWriterRegionServer extends Thread {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    final AtomicLong editsCount;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    final AtomicBoolean stop;<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    final int numOfWriters;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    /**<a name="line.288"></a>
+<span class="sourceLineNo">289</span>     * Region to write edits for.<a name="line.289"></a>
+<span class="sourceLineNo">290</span>     */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    final String region;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    final User user;<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>    public ZombieLastLogWriterRegionServer(AtomicLong counter, AtomicBoolean stop,<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        final String region, final int writers)<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        throws IOException, InterruptedException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      super("ZombieLastLogWriterRegionServer");<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      setDaemon(true);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      this.stop = stop;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      this.editsCount = counter;<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      this.region = region;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      this.user = User.createUserForTesting(conf, ZOMBIE, GROUP);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      numOfWriters = writers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    public void run() {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      try {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        doWriting();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      } catch (IOException e) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        LOG.warn(getName() + " Writer exiting " + e);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } catch (InterruptedException e) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        LOG.warn(getName() + " Writer exiting " + e);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      }<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>    private void doWriting() throws IOException, InterruptedException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      this.user.runAs(new PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        public Object run() throws Exception {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>          // Index of the WAL we want to keep open.  generateWALs will leave open the WAL whose<a name="line.321"></a>
+<span class="sourceLineNo">322</span>          // index we supply here.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>          int walToKeepOpen = numOfWriters - 1;<a name="line.323"></a>
+<span class="sourceLineNo">324</span>          // The below method writes numOfWriters files each with ENTRIES entries for a total of<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          // numOfWriters * ENTRIES added per column family in the region.<a name="line.325"></a>
+<span class="sourceLineNo">326</span>          Writer writer = null;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>          try {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>            writer = generateWALs(numOfWriters, ENTRIES, walToKeepOpen);<a name="line.328"></a>
+<span class="sourceLineNo">329</span>          } catch (IOException e1) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            throw new RuntimeException("Failed", e1);<a name="line.330"></a>
+<span class="sourceLineNo">331</span>          }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>          // Update counter so has all edits written so far.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>          editsCount.addAndGet(numOfWriters * ENTRIES);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>          loop(writer);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>          // If we've been interruped, then things should have shifted out from under us.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>          // closing should error<a name="line.336"></a>
+<span class="sourceLineNo">337</span>          try {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>            writer.close();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>            fail("Writing closing after parsing should give an error.");<a name="line.339"></a>
+<span class="sourceLineNo">340</span>          } catch (IOException exception) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>            LOG.debug("ignoring error when closing final writer.", exception);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>          }<a name="line.342"></a>
+<span class="sourceLineNo">343</span>          return null;<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><a name="line.347"></a>
+<span class="sourceLineNo">348</span>    private void loop(final Writer writer) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      byte [] regionBytes = Bytes.toBytes(this.region);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      while (!stop.get()) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>          long seq = appendEntry(writer, TABLE_NAME, regionBytes,<a name="line.352"></a>
+<span class="sourceLineNo">353</span>              Bytes.toBytes("r" + editsCount.get()), regionBytes, QUALIFIER, VALUE, 0);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>          long count = editsCount.incrementAndGet();<a name="line.354"></a>
+<span class="sourceLineNo">355</span>          LOG.info(getName() + " sync count=" + count + ", seq=" + seq);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          try {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            Thread.sleep(1);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>          } catch (InterruptedException e) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>            //<a name="line.359"></a>
+<span class="sourceLineNo">360</span>          }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        } catch (IOException ex) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          LOG.error(getName() + " ex " + ex.toString());<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (ex instanceof RemoteException) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            LOG.error("Juliet: got RemoteException " + ex.getMessage() +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                " while writing " + (editsCount.get() + 1));<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          } else {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>            LOG.error(getName() + " failed to write....at " + editsCount.get());<a name="line.367"></a>
+<span class="sourceLineNo">368</span>            fail("Failed to write " + editsCount.get());<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          break;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        } catch (Throwable t) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          LOG.error(getName() + " HOW? " + t);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>          LOG.debug("exception details", t);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          break;<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>      LOG.info(getName() + " Writer exiting");<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><a name="line.380"></a>
+<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  @Test<a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    Path regiondir = new Path(tdir,<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    fs.mkdirs(regiondir);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    long now = System.currentTimeMillis();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    Entry entry =<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        new Entry(new WALKeyImpl(encoded,<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            new WALEdit());<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.396"></a>
+<span class="sourceLineNo">397</span>        FILENAME_BEING_SPLIT, TMPDIRNAME, conf);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.399"></a>
+<span class="sourceLineNo">400</span>  }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>  /**<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   * This is useful in upgrading old instances.<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   */<a name="line.405"></a>
+<span class="sourceLineNo">406</span>  @Test<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    Path regiondir = new Path(tdir,<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    fs.mkdirs(regiondir);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    long now = System.currentTimeMillis();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    Entry entry =<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        new Entry(new WALKeyImpl(encoded,<a name="line.415"></a>
+<span class="sourceLineNo">416</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.416"></a>
+<span class="sourceLineNo">417</span>            new WALEdit());<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    Path parent = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    assertEquals(HConstants.RECOVERED_EDITS_DIR, parent.getName());<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    fs.createNewFile(parent); // create a recovered.edits file<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        FILENAME_BEING_SPLIT, TMPDIRNAME, conf);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    WALFactory.createRecoveredEditsWriter(fs, p, conf).close();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>  private void useDifferentDFSClient() throws IOException {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    // make fs act as a different client now<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    // initialize will create a new DFSClient with a new client ID<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    fs.initialize(fs.getUri(), conf);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  @Test<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    final String REGION = "region__1";<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    REGIONS.clear();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    REGIONS.add(REGION);<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    generateWALs(1, 10, -1, 0);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    useDifferentDFSClient();<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    assertEquals(1, splitLog.length);<a name="line.446"></a>
 <span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  @Test<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    final String REGION = "region__1";<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    REGIONS.clear();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    REGIONS.add(REGION);<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span>    generateWALs(1, 10, -1, 100);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    useDifferentDFSClient();<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    assertEquals(1, splitLog.length);<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    // split log should only have the test edits<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    assertEquals(10, countWAL(splitLog[0]));<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @Test<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    REGIONS.clear();<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    REGIONS.add(hri.getEncodedName());<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    Path regionDir = new Path(FSUtils.getTableDir(HBASEDIR, TABLE_NAME), hri.getEncodedName());<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    LOG.info("Creating region directory: " + regionDir);<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    assertTrue(fs.mkdirs(regionDir));<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span>    Writer writer = generateWALs(1, 10, 0, 10);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    String[] compactInputs = new String[]{"file1", "file2", "file3"};<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    String compactOutput = "file4";<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    appendCompactionEvent(writer, hri, compactInputs, compactOutput);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    writer.close();<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    useDifferentDFSClient();<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.483"></a>
+<span class="sourceLineNo">448</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.448"></a>
+<span class="sourceLineNo">449</span>  }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span>  @Test<a name="line.451"></a>
+<span class="sourceLineNo">452</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    final String REGION = "region__1";<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    REGIONS.clear();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    REGIONS.add(REGION);<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>    generateWALs(1, 10, -1, 100);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    useDifferentDFSClient();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    assertEquals(1, splitLog.length);<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    // split log should only have the test edits<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    assertEquals(10, countWAL(splitLog[0]));<a name="line.466"></a>
+<span class="sourceLineNo">467</span>  }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>  @Test<a name="line.470"></a>
+<span class="sourceLineNo">471</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    REGIONS.clear();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    REGIONS.add(hri.getEncodedName());<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    Path regionDir = new Path(FSUtils.getTableDir(HBASEDIR, TABLE_NAME), hri.getEncodedName());<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    LOG.info("Creating region directory: " + regionDir);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    assertTrue(fs.mkdirs(regionDir));<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    Writer writer = generateWALs(1, 10, 0, 10);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    String[] compactInputs = new String[]{"file1", "file2", "file3"};<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    String compactOutput = "file4";<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    appendCompactionEvent(writer, hri, compactInputs, compactOutput);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    writer.close();<a name="line.483"></a>
 <span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    // original log should have 10 test edits, 10 region markers, 1 compaction marker<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    assertEquals(21, countWAL(originalLog));<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, hri.getEncodedName());<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    assertEquals(1, splitLog.length);<a name="line.490"></a>
+<span class="sourceLineNo">485</span>    useDifferentDFSClient();<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    // original log should have 10 test edits, 10 region markers, 1 compaction marker<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    assertEquals(21, countWAL(originalLog));<a name="line.490"></a>
 <span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    // split log should have 10 test edits plus 1 compaction marker<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    assertEquals(11, countWAL(splitLog[0]));<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>  /**<a name="line.497"></a>
-<span class="sourceLineNo">498</span>   * @param expectedEntries -1 to not assert<a name="line.498"></a>
-<span class="sourceLineNo">499</span>   * @return the count across all regions<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>  private int splitAndCount(final int expectedFiles, final int expectedEntries)<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      throws IOException {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    useDifferentDFSClient();<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    int result = 0;<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    for (String region : REGIONS) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      assertEquals(expectedFiles, logfiles.length);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      int count = 0;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      for (Path logfile: logfiles) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        count += countWAL(logfile);<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      if (-1 != expectedEntries) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>        assertEquals(expectedEntries, count);<a name="line.514"></a>
+<span class="sourceLineNo">492</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, hri.getEncodedName());<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    assertEquals(1, splitLog.length);<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    // split log should have 10 test edits plus 1 compaction marker<a name="line.496"></a>
+<span class="sourceLineNo">497</span>    assertEquals(11, countWAL(splitLog[0]));<a name="line.497"></a>
+<span class="sourceLineNo">498</span>  }<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>  /**<a name="line.500"></a>
+<span class="sourceLineNo">501</span>   * @param expectedEntries -1 to not assert<a name="line.501"></a>
+<span class="sourceLineNo">502</span>   * @return the count across all regions<a name="line.502"></a>
+<span class="sourceLineNo">503</span>   */<a name="line.503"></a>
+<span class="sourceLineNo">504</span>  private int splitAndCount(final int expectedFiles, final int expectedEntries)<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      throws IOException {<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    useDifferentDFSClient();<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    int result = 0;<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    for (String region : REGIONS) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      assertEquals(expectedFiles, logfiles.length);<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      int count = 0;<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      for (Path logfile: logfiles) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        count += countWAL(logfile);<a name="line.514"></a>
 <span class="sourceLineNo">515</span>      }<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      result += count;<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    }<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    return result;<a name="line.518"></a>
-<span class="sourceLineNo">519</span>  }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>  @Test<a name="line.521"></a>
-<span class="sourceLineNo">522</span>  public void testEmptyLogFiles() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    testEmptyLogFiles(true);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>  }<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  @Test<a name="line.526"></a>
-<span class="sourceLineNo">527</span>  public void testEmptyOpenLogFiles() throws IOException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    testEmptyLogFiles(false);<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>  private void testEmptyLogFiles(final boolean close) throws IOException {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    // we won't create the hlog dir until getWAL got called, so<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    // make dir here when testing empty log file<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    fs.mkdirs(WALDIR);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    injectEmptyFile(".empty", close);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    generateWALs(Integer.MAX_VALUE);<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    injectEmptyFile("empty", close);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); // skip 2 empty<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>  @Test<a name="line.541"></a>
-<span class="sourceLineNo">542</span>  public void testOpenZeroLengthReportedFileButWithDataGetsSplit() throws IOException {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    // generate logs but leave wal.dat.5 open.<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    generateWALs(5);<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.545"></a>
-<span class="sourceLineNo">546</span>  }<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>  @Test<a name="line.548"></a>
-<span class="sourceLineNo">549</span>  public void testTralingGarbageCorruptionFileSkipErrorsPasses() throws IOException {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    generateWALs(Integer.MAX_VALUE);<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    corruptWAL(new Path(WALDIR, WAL_FILE_PREFIX + "5"),<a name="line.552"></a>
-<span class="sourceLineNo">553</span>        Corruptions.APPEND_GARBAGE, true);<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  @Test<a name="line.557"></a>
-<span class="sourceLineNo">558</span>  public void testFirstLineCorruptionLogFileSkipErrorsPasses() throws IOException {<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    generateWALs(Integer.MAX_VALUE);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    corruptWAL(new Path(WALDIR, WAL_FILE_PREFIX + "5"),<a name="line.561"></a>
-<span class="sourceLineNo">562</span>        Corruptions.INSERT_GARBAGE_ON_FIRST_LINE, true);<a name="line.562"></a>
-<span class="sourceLineNo">563</span>    splitAndCount(NUM_WRITERS - 1, (NUM_WRITERS - 1) * ENTRIES); //1 corrupt<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>  @Test<a name="line.566"></a>
-<span class="sourceLineNo">567</span>  public void testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    generateWALs(Integer.MAX_VALUE);<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    corruptWAL(new Path(WALDIR, WAL_FILE_PREFIX + "5"),<a name="line.570"></a>
-<span class="sourceLineNo">571</span>        Corruptions.INSERT_GARBAGE_IN_THE_MIDDLE, false);<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    // the entries in the original logs are alternating regions<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    // considering the sequence file header, the middle corruption should<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    // affect at least half of the entries<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    int goodEntries = (NUM_WRITERS - 1) * ENTRIES;<a name="line.575"></a>
-<span class="sourceLineNo">576</span>    int firstHalfEntries = (int) Math.ceil(ENTRIES / 2) - 1;<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    int allRegionsCount = splitAndCount(NUM_WRITERS, -1);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    assertTrue("The file up to the corrupted area hasn't been parsed",<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        REGIONS.size() * (goodEntries + firstHalfEntries) &lt;= allRegionsCount);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>  }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  public void testCorruptedFileGetsArchivedIfSkipErrors() throws IOException {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    List&lt;FaultyProtobufLogReader.FailureType&gt; failureTypes = Arrays<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        .asList(FaultyProtobufLogReader.FailureType.values()).stream()<a name="line.586"></a>
-<span class="sourceLineNo">587</span>        .filter(x -&gt; x != FaultyProtobufLogReader.FailureType.NONE).collect(Collectors.toList());<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    for (FaultyProtobufLogReader.FailureType failureType : failureTypes) {<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      final Set&lt;String&gt; walDirContents = splitCorruptWALs(failureType);<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      final Set&lt;String&gt; archivedLogs = new HashSet&lt;&gt;();<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      final StringBuilder archived = new StringBuilder("Archived logs in CORRUPTDIR:");<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      for (FileStatus log : fs.listStatus(CORRUPTDIR)) {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>        archived.append("\n\t").append(log.toString());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        archivedLogs.add(log.getPath().getName());<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug(archived.toString());<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      assertEquals(failureType.name() + ": expected to find all of our wals corrupt.", archivedLogs,<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          walDirContents);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    }<a name="line.599"></a>
-<span class="sourceLineNo">600</span>  }<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span>  /**<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   * @return set of wal names present prior to split attempt.<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * @throws IOException if the split process fails<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   */<a name="line.605"></a>
-<span class="sourceLineNo">606</span>  private Set&lt;String&gt; splitCorruptWALs(final FaultyProtobufLogReader.FailureType failureType)<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      throws IOException {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Class&lt;?&gt; backupClass = conf.getClass("hbase.regionserver.hlog.reader.impl",<a name="line.608"></a>
-<span class="sourceLineNo">609</span>        Reader.class);<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    InstrumentedLogWriter.activateFailure = false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span><a name="line.611"></a>
-<span class="sourceLineNo">612</span>    try {<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      conf.setClass("hbase.regionserver.hlog.reader.impl", FaultyProtobufLogReader.class,<a name="line.613"></a>
-<span class="sourceLineNo">614</span>        Reader.class);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      conf.set("faultyprotobuflogreader.failuretype", failureType.name());<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      // Clean up from previous tests or previous loop<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        wals.shutdown();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException exception) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        // since we're splitting out from under the factory, we should expect some closing failures.<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        LOG.debug("Ignoring problem closing WALFactory.", exception);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      wals.close();<a name="line.623"></a>
-<span class="sourceLineNo">624</span>      try {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        for (FileStatus log : fs.listStatus(CORRUPTDIR)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>          fs.delete(log.getPath(), true);<a name="line.626"></a>
-<span class="sourceLineNo">627</span>        }<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      } catch (FileNotFoundException exception) {<a name="line.628"></a>
-<span class="sourceLineNo">629</span>        LOG.debug("no previous CORRUPTDIR to clean.");<a name="line.629"></a>
-<span class="sourceLineNo">63

<TRUNCATED>

[03/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.html b/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.html
index 3cd501d..87020c8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.html
@@ -244,22 +244,26 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#TEST_UTIL">TEST_UTIL</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#TMPDIRNAME">TMPDIRNAME</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private static byte[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#VALUE">VALUE</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#WAL_FILE_PREFIX">WAL_FILE_PREFIX</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private org.apache.hadoop.fs.Path</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#WALDIR">WALDIR</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private org.apache.hadoop.hbase.wal.WALFactory</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#wals">wals</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.html#ZOMBIE">ZOMBIE</a></span></code>&nbsp;</td>
 </tr>
@@ -698,13 +702,22 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <pre>private&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.132">TABLEDIR</a></pre>
 </li>
 </ul>
+<a name="TMPDIRNAME">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TMPDIRNAME</h4>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.133">TMPDIRNAME</a></pre>
+</li>
+</ul>
 <a name="NUM_WRITERS">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>NUM_WRITERS</h4>
-<pre>private static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.134">NUM_WRITERS</a></pre>
+<pre>private static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.135">NUM_WRITERS</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.wal.TestWALSplit.NUM_WRITERS">Constant Field Values</a></dd>
@@ -717,7 +730,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>ENTRIES</h4>
-<pre>private static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.135">ENTRIES</a></pre>
+<pre>private static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.136">ENTRIES</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.wal.TestWALSplit.ENTRIES">Constant Field Values</a></dd>
@@ -730,7 +743,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>FILENAME_BEING_SPLIT</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.137">FILENAME_BEING_SPLIT</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.138">FILENAME_BEING_SPLIT</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.wal.TestWALSplit.FILENAME_BEING_SPLIT">Constant Field Values</a></dd>
@@ -743,7 +756,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>TABLE_NAME</h4>
-<pre>private static final&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.138">TABLE_NAME</a></pre>
+<pre>private static final&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.139">TABLE_NAME</a></pre>
 </li>
 </ul>
 <a name="FAMILY">
@@ -752,7 +765,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>FAMILY</h4>
-<pre>private static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.140">FAMILY</a></pre>
+<pre>private static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.141">FAMILY</a></pre>
 </li>
 </ul>
 <a name="QUALIFIER">
@@ -761,7 +774,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>QUALIFIER</h4>
-<pre>private static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.141">QUALIFIER</a></pre>
+<pre>private static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.142">QUALIFIER</a></pre>
 </li>
 </ul>
 <a name="VALUE">
@@ -770,7 +783,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>VALUE</h4>
-<pre>private static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.142">VALUE</a></pre>
+<pre>private static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.143">VALUE</a></pre>
 </li>
 </ul>
 <a name="WAL_FILE_PREFIX">
@@ -779,7 +792,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>WAL_FILE_PREFIX</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.143">WAL_FILE_PREFIX</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.144">WAL_FILE_PREFIX</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.wal.TestWALSplit.WAL_FILE_PREFIX">Constant Field Values</a></dd>
@@ -792,7 +805,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>REGIONS</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.144">REGIONS</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.145">REGIONS</a></pre>
 </li>
 </ul>
 <a name="HBASE_SKIP_ERRORS">
@@ -801,7 +814,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>HBASE_SKIP_ERRORS</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.145">HBASE_SKIP_ERRORS</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.146">HBASE_SKIP_ERRORS</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.wal.TestWALSplit.HBASE_SKIP_ERRORS">Constant Field Values</a></dd>
@@ -814,7 +827,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>ROBBER</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.146">ROBBER</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.147">ROBBER</a></pre>
 </li>
 </ul>
 <a name="ZOMBIE">
@@ -823,7 +836,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>ZOMBIE</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.147">ZOMBIE</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.148">ZOMBIE</a></pre>
 </li>
 </ul>
 <a name="GROUP">
@@ -832,7 +845,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>GROUP</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.148">GROUP</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.html#line.149">GROUP</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -841,7 +854,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>name</h4>
-<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.182">name</a></pre>
+<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.183">name</a></pre>
 </li>
 </ul>
 <a name="wals">
@@ -850,7 +863,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>wals</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALFactory <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.183">wals</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALFactory <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.184">wals</a></pre>
 </li>
 </ul>
 </li>
@@ -884,7 +897,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpBeforeClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.159">setUpBeforeClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.160">setUpBeforeClass</a>()
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -898,7 +911,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDownAfterClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.177">tearDownAfterClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.178">tearDownAfterClass</a>()
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -912,7 +925,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setUp</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.186">setUp</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.187">setUp</a>()
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -926,7 +939,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.205">tearDown</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.208">tearDown</a>()
               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -940,7 +953,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testLogCannotBeWrittenOnceParsed</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.227">testLogCannotBeWrittenOnceParsed</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.230">testLogCannotBeWrittenOnceParsed</a>()
                                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                                              <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <div class="block">Simulates splitting a WAL out from under a regionserver that is still trying to write it.
@@ -958,7 +971,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testRecoveredEditsPathForMeta</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.382">testRecoveredEditsPathForMeta</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.385">testRecoveredEditsPathForMeta</a>()
                                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><code>https://issues.apache.org/jira/browse/HBASE-3020</code></div>
 <dl>
@@ -973,7 +986,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testOldRecoveredEditsFileSidelined</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.404">testOldRecoveredEditsFileSidelined</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.407">testOldRecoveredEditsFileSidelined</a>()
                                         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Test old recovered edits file doesn't break WALSplitter.
  This is useful in upgrading old instances.</div>
@@ -989,7 +1002,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>useDifferentDFSClient</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.426">useDifferentDFSClient</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.429">useDifferentDFSClient</a>()
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1003,7 +1016,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitPreservesEdits</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.433">testSplitPreservesEdits</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.436">testSplitPreservesEdits</a>()
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1017,7 +1030,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitRemovesRegionEventsEdits</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.449">testSplitRemovesRegionEventsEdits</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.452">testSplitRemovesRegionEventsEdits</a>()
                                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1031,7 +1044,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitLeavesCompactionEventsEdits</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.468">testSplitLeavesCompactionEventsEdits</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.471">testSplitLeavesCompactionEventsEdits</a>()
                                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1045,7 +1058,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>splitAndCount</h4>
-<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.501">splitAndCount</a>(int&nbsp;expectedFiles,
+<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.504">splitAndCount</a>(int&nbsp;expectedFiles,
                           int&nbsp;expectedEntries)
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -1064,7 +1077,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testEmptyLogFiles</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.522">testEmptyLogFiles</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.525">testEmptyLogFiles</a>()
                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1078,7 +1091,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testEmptyOpenLogFiles</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.527">testEmptyOpenLogFiles</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.530">testEmptyOpenLogFiles</a>()
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1092,7 +1105,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testEmptyLogFiles</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.531">testEmptyLogFiles</a>(boolean&nbsp;close)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.534">testEmptyLogFiles</a>(boolean&nbsp;close)
                         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1106,7 +1119,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testOpenZeroLengthReportedFileButWithDataGetsSplit</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.542">testOpenZeroLengthReportedFileButWithDataGetsSplit</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.545">testOpenZeroLengthReportedFileButWithDataGetsSplit</a>()
                                                         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1120,7 +1133,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testTralingGarbageCorruptionFileSkipErrorsPasses</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.549">testTralingGarbageCorruptionFileSkipErrorsPasses</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.552">testTralingGarbageCorruptionFileSkipErrorsPasses</a>()
                                                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1134,7 +1147,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testFirstLineCorruptionLogFileSkipErrorsPasses</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.558">testFirstLineCorruptionLogFileSkipErrorsPasses</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.561">testFirstLineCorruptionLogFileSkipErrorsPasses</a>()
                                                     throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1148,7 +1161,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.567">testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.570">testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile</a>()
                                                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1162,7 +1175,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testCorruptedFileGetsArchivedIfSkipErrors</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.583">testCorruptedFileGetsArchivedIfSkipErrors</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.586">testCorruptedFileGetsArchivedIfSkipErrors</a>()
                                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1176,7 +1189,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>splitCorruptWALs</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.606">splitCorruptWALs</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/wal/FaultyProtobufLogReader.FailureType.html" title="enum in org.apache.hadoop.hbase.regionserver.wal">FaultyProtobufLogReader.FailureType</a>&nbsp;failureType)
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.609">splitCorruptWALs</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/wal/FaultyProtobufLogReader.FailureType.html" title="enum in org.apache.hadoop.hbase.regionserver.wal">FaultyProtobufLogReader.FailureType</a>&nbsp;failureType)
                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1192,7 +1205,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.649">testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.652">testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows</a>()
                                                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1206,7 +1219,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.656">testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.659">testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs</a>()
                                                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1220,7 +1233,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreCorruption</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.668">ignoreCorruption</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>&nbsp;corruption,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.671">ignoreCorruption</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>&nbsp;corruption,
                               int&nbsp;entryCount,
                               int&nbsp;expectedCount)
                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1236,7 +1249,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testEOFisIgnored</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.701">testEOFisIgnored</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.704">testEOFisIgnored</a>()
                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1250,7 +1263,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testCorruptWALTrailer</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.707">testCorruptWALTrailer</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.710">testCorruptWALTrailer</a>()
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1264,7 +1277,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testLogsGetArchivedAfterSplit</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.713">testLogsGetArchivedAfterSplit</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.716">testLogsGetArchivedAfterSplit</a>()
                                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1278,7 +1291,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplit</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.723">testSplit</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.726">testSplit</a>()
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1292,7 +1305,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testLogDirectoryShouldBeDeletedAfterSuccessfulSplit</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.729">testLogDirectoryShouldBeDeletedAfterSuccessfulSplit</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.732">testLogDirectoryShouldBeDeletedAfterSuccessfulSplit</a>()
                                                          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1306,7 +1319,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitWillFailIfWritingToRegionFails</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.747">testSplitWillFailIfWritingToRegionFails</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.750">testSplitWillFailIfWritingToRegionFails</a>()
                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1320,7 +1333,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitDeletedRegion</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.774">testSplitDeletedRegion</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.777">testSplitDeletedRegion</a>()
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1334,7 +1347,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testIOEOnOutputThread</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.789">testIOEOnOutputThread</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.792">testIOEOnOutputThread</a>()
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1348,7 +1361,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>retryOverHdfsProblem</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.856">retryOverHdfsProblem</a>(org.apache.hadoop.fs.FileSystem&nbsp;spiedFs)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.859">retryOverHdfsProblem</a>(org.apache.hadoop.fs.FileSystem&nbsp;spiedFs)
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1364,7 +1377,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testMovedWALDuringRecovery</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.871">testMovedWALDuringRecovery</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.874">testMovedWALDuringRecovery</a>()
                                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1378,7 +1391,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testRetryOpenDuringRecovery</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.883">testRetryOpenDuringRecovery</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.886">testRetryOpenDuringRecovery</a>()
                                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1392,7 +1405,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testTerminationAskedByReporter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.912">testTerminationAskedByReporter</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.915">testTerminationAskedByReporter</a>()
                                     throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                                            org.apache.hadoop.hbase.wal.WALSplitter.CorruptedLogFileException</pre>
 <dl>
@@ -1408,7 +1421,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testThreading</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.956">testThreading</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.959">testThreading</a>()
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test log split process with fake data and lots of edits to trigger threading
  issues.</div>
@@ -1424,7 +1437,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testThreadingSlowWriterSmallBuffer</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.965">testThreadingSlowWriterSmallBuffer</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.968">testThreadingSlowWriterSmallBuffer</a>()
                                         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test blocking behavior of the log split process if writers are writing slower
  than the reader is reading.</div>
@@ -1440,7 +1453,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>doTestThreading</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.981">doTestThreading</a>(int&nbsp;numFakeEdits,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.984">doTestThreading</a>(int&nbsp;numFakeEdits,
                              int&nbsp;bufferSize,
                              int&nbsp;writerSlowness)
                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -1466,7 +1479,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitLogFileDeletedRegionDir</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1073">testSplitLogFileDeletedRegionDir</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1076">testSplitLogFileDeletedRegionDir</a>()
                                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1480,7 +1493,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitLogFileEmpty</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1090">testSplitLogFileEmpty</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1093">testSplitLogFileEmpty</a>()
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1494,7 +1507,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitLogFileMultipleRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1106">testSplitLogFileMultipleRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1109">testSplitLogFileMultipleRegions</a>()
                                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1508,7 +1521,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitLogFileFirstLineCorruptionLog</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1113">testSplitLogFileFirstLineCorruptionLog</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1116">testSplitLogFileFirstLineCorruptionLog</a>()
                                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1522,7 +1535,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testConcurrentSplitLogAndReplayRecoverEdit</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1133">testConcurrentSplitLogAndReplayRecoverEdit</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1136">testConcurrentSplitLogAndReplayRecoverEdit</a>()
                                                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><code>https://issues.apache.org/jira/browse/HBASE-4862</code></div>
 <dl>
@@ -1537,7 +1550,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>generateWALs</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1184">generateWALs</a>(int&nbsp;leaveOpen)
+<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1187">generateWALs</a>(int&nbsp;leaveOpen)
                                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1551,7 +1564,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>generateWALs</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1188">generateWALs</a>(int&nbsp;writers,
+<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1191">generateWALs</a>(int&nbsp;writers,
                                                                     int&nbsp;entries,
                                                                     int&nbsp;leaveOpen)
                                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1567,7 +1580,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>makeRegionDirs</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1192">makeRegionDirs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;regions)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1195">makeRegionDirs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;regions)
                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1581,7 +1594,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>generateWALs</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1203">generateWALs</a>(int&nbsp;writers,
+<pre>private&nbsp;org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1206">generateWALs</a>(int&nbsp;writers,
                                                                     int&nbsp;entries,
                                                                     int&nbsp;leaveOpen,
                                                                     int&nbsp;regionEvents)
@@ -1602,7 +1615,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getLogForRegion</h4>
-<pre>private&nbsp;org.apache.hadoop.fs.Path[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1237">getLogForRegion</a>(org.apache.hadoop.fs.Path&nbsp;rootdir,
+<pre>private&nbsp;org.apache.hadoop.fs.Path[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1240">getLogForRegion</a>(org.apache.hadoop.fs.Path&nbsp;rootdir,
                                                     org.apache.hadoop.hbase.TableName&nbsp;table,
                                                     <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;region)
                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1618,7 +1631,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>corruptWAL</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1259">corruptWAL</a>(org.apache.hadoop.fs.Path&nbsp;path,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1262">corruptWAL</a>(org.apache.hadoop.fs.Path&nbsp;path,
                         <a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>&nbsp;corruption,
                         boolean&nbsp;close)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1634,7 +1647,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>closeOrFlush</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1312">closeOrFlush</a>(boolean&nbsp;close,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1315">closeOrFlush</a>(boolean&nbsp;close,
                           org.apache.hadoop.fs.FSDataOutputStream&nbsp;out)
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -1649,7 +1662,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>countWAL</h4>
-<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1337">countWAL</a>(org.apache.hadoop.fs.Path&nbsp;log)
+<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1340">countWAL</a>(org.apache.hadoop.fs.Path&nbsp;log)
               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1663,7 +1676,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>appendCompactionEvent</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1347">appendCompactionEvent</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;w,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1350">appendCompactionEvent</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;w,
                                           org.apache.hadoop.hbase.client.RegionInfo&nbsp;hri,
                                           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;inputs,
                                           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;output)
@@ -1680,7 +1693,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>appendRegionEvent</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1365">appendRegionEvent</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;w,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1368">appendRegionEvent</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;w,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;region)
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -1695,7 +1708,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>appendEntry</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1383">appendEntry</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;writer,
+<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1386">appendEntry</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;writer,
                                org.apache.hadoop.hbase.TableName&nbsp;table,
                                byte[]&nbsp;region,
                                byte[]&nbsp;row,
@@ -1716,7 +1729,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createTestEntry</h4>
-<pre>private static&nbsp;org.apache.hadoop.hbase.wal.WAL.Entry&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1394">createTestEntry</a>(org.apache.hadoop.hbase.TableName&nbsp;table,
+<pre>private static&nbsp;org.apache.hadoop.hbase.wal.WAL.Entry&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1397">createTestEntry</a>(org.apache.hadoop.hbase.TableName&nbsp;table,
                                                                      byte[]&nbsp;region,
                                                                      byte[]&nbsp;row,
                                                                      byte[]&nbsp;family,
@@ -1731,7 +1744,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>injectEmptyFile</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1408">injectEmptyFile</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;suffix,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1411">injectEmptyFile</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;suffix,
                              boolean&nbsp;closeFile)
                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -1746,7 +1759,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>logsAreEqual</h4>
-<pre>private&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1416">logsAreEqual</a>(org.apache.hadoop.fs.Path&nbsp;p1,
+<pre>private&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.1419">logsAreEqual</a>(org.apache.hadoop.fs.Path&nbsp;p1,
                              org.apache.hadoop.fs.Path&nbsp;p2)
                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>


[31/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellReducer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellReducer.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellReducer.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellReducer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellReducer.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.append(sourceCf + ":" + destCf);<a name="line.583"></a>
+<sp

<TRUNCATED>

[09/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[05/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[14/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[38/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
index b78489c..dc56751 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
@@ -443,7 +443,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>filterCellByStore</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1534">filterCellByStore</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1536">filterCellByStore</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry)</pre>
 </li>
 </ul>
 <a name="append-org.apache.hadoop.hbase.wal.WALSplitter.RegionEntryBuffer-">
@@ -452,7 +452,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1564">append</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1566">append</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -470,7 +470,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>appendBuffer</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.WriterAndPath</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1568">appendBuffer</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer,
+<pre><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.WriterAndPath</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1570">appendBuffer</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer,
                                        boolean&nbsp;reusable)
                                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -485,7 +485,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>keepRegionEvent</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1613">keepRegionEvent</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;entry)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1615">keepRegionEvent</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;entry)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html#keepRegionEvent-org.apache.hadoop.hbase.wal.WAL.Entry-">WALSplitter.OutputSink</a></code></span></div>
 <div class="block">Some WALEdit's contain only KV's for account on what happened to a region.
  Not all sinks will want to get all of those edits.</div>
@@ -503,7 +503,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputCounts</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1627">getOutputCounts</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1629">getOutputCounts</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html#getOutputCounts--">getOutputCounts</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.OutputSink</a></code></dd>
@@ -518,7 +518,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getNumberOfRecoveredRegions</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1636">getNumberOfRecoveredRegions</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1638">getNumberOfRecoveredRegions</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html#getNumberOfRecoveredRegions--">getNumberOfRecoveredRegions</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.OutputSink</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
index 8fba2f6..484a6f9 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1800">WALSplitter.MutationReplay</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1802">WALSplitter.MutationReplay</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;</pre>
 <div class="block">A struct used by getMutationsFromWALEntry</div>
@@ -230,7 +230,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
-<pre>public final&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1812">type</a></pre>
+<pre>public final&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1814">type</a></pre>
 </li>
 </ul>
 <a name="mutation">
@@ -239,7 +239,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>mutation</h4>
-<pre>public final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1813">mutation</a></pre>
+<pre>public final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1815">mutation</a></pre>
 </li>
 </ul>
 <a name="nonceGroup">
@@ -248,7 +248,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>nonceGroup</h4>
-<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1814">nonceGroup</a></pre>
+<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1816">nonceGroup</a></pre>
 </li>
 </ul>
 <a name="nonce">
@@ -257,7 +257,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>nonce</h4>
-<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1815">nonce</a></pre>
+<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1817">nonce</a></pre>
 </li>
 </ul>
 </li>
@@ -274,7 +274,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MutationReplay</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1801">MutationReplay</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType&nbsp;type,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1803">MutationReplay</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType&nbsp;type,
                       <a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>&nbsp;mutation,
                       long&nbsp;nonceGroup,
                       long&nbsp;nonce)</pre>
@@ -294,7 +294,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>compareTo</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1818">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&nbsp;d)</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1820">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&nbsp;d)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true#compareTo-T-" title="class or interface in java.lang">compareTo</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;</code></dd>
@@ -307,7 +307,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1823">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1825">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -320,7 +320,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>hashCode</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1832">hashCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1834">hashCode</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
index c1324e6..56d0991 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1754">WALSplitter.SinkWriter</a>
+<pre>public abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1756">WALSplitter.SinkWriter</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Class wraps the actual writer which writes data out and related statistics</div>
 </li>
@@ -222,7 +222,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>editsWritten</h4>
-<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1756">editsWritten</a></pre>
+<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1758">editsWritten</a></pre>
 </li>
 </ul>
 <a name="editsSkipped">
@@ -231,7 +231,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>editsSkipped</h4>
-<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1758">editsSkipped</a></pre>
+<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1760">editsSkipped</a></pre>
 </li>
 </ul>
 <a name="nanosSpent">
@@ -240,7 +240,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>nanosSpent</h4>
-<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1760">nanosSpent</a></pre>
+<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1762">nanosSpent</a></pre>
 </li>
 </ul>
 </li>
@@ -257,7 +257,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SinkWriter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1754">SinkWriter</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1756">SinkWriter</a>()</pre>
 </li>
 </ul>
 </li>
@@ -274,7 +274,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementEdits</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1762">incrementEdits</a>(int&nbsp;edits)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1764">incrementEdits</a>(int&nbsp;edits)</pre>
 </li>
 </ul>
 <a name="incrementSkippedEdits-int-">
@@ -283,7 +283,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementSkippedEdits</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1766">incrementSkippedEdits</a>(int&nbsp;skipped)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1768">incrementSkippedEdits</a>(int&nbsp;skipped)</pre>
 </li>
 </ul>
 <a name="incrementNanoTime-long-">
@@ -292,7 +292,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>incrementNanoTime</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1770">incrementNanoTime</a>(long&nbsp;nanos)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1772">incrementNanoTime</a>(long&nbsp;nanos)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
index df08874..e8391c3 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
@@ -112,7 +112,7 @@
 </dl>
 <hr>
 <br>
-<pre>private static final class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1779">WALSplitter.WriterAndPath</a>
+<pre>private static final class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1781">WALSplitter.WriterAndPath</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.SinkWriter</a></pre>
 <div class="block">Private data structure that wraps a Writer and its Path, also collecting statistics about the
  data written to this output.</div>
@@ -215,7 +215,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockList">
 <li class="blockList">
 <h4>p</h4>
-<pre>final&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1780">p</a></pre>
+<pre>final&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1782">p</a></pre>
 </li>
 </ul>
 <a name="w">
@@ -224,7 +224,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockList">
 <li class="blockList">
 <h4>w</h4>
-<pre>final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/WALProvider.Writer.html" title="interface in org.apache.hadoop.hbase.wal">WALProvider.Writer</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1781">w</a></pre>
+<pre>final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/WALProvider.Writer.html" title="interface in org.apache.hadoop.hbase.wal">WALProvider.Writer</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1783">w</a></pre>
 </li>
 </ul>
 <a name="minLogSeqNum">
@@ -233,7 +233,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockListLast">
 <li class="blockList">
 <h4>minLogSeqNum</h4>
-<pre>final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1782">minLogSeqNum</a></pre>
+<pre>final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1784">minLogSeqNum</a></pre>
 </li>
 </ul>
 </li>
@@ -250,7 +250,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WriterAndPath</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1784">WriterAndPath</a>(org.apache.hadoop.fs.Path&nbsp;p,
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1786">WriterAndPath</a>(org.apache.hadoop.fs.Path&nbsp;p,
               <a href="../../../../../org/apache/hadoop/hbase/wal/WALProvider.Writer.html" title="interface in org.apache.hadoop.hbase.wal">WALProvider.Writer</a>&nbsp;w,
               long&nbsp;minLogSeqNum)</pre>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
index 6042f21..0257e4b 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
@@ -431,8 +431,9 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>(package private) static org.apache.hadoop.fs.Path</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;fileNameBeingSplit,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tmpDirName,
                        org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
  <code>logEntry</code> named for the sequenceid in the passed
@@ -909,14 +910,15 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
-<a name="getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">
+<a name="getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRegionSplitEditsPath</h4>
-<pre>static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.469">getRegionSplitEditsPath</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
+<pre>static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.470">getRegionSplitEditsPath</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
                                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;fileNameBeingSplit,
+                                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tmpDirName,
                                                          org.apache.hadoop.conf.Configuration&nbsp;conf)
                                                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
@@ -928,6 +930,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>logEntry</code> - </dd>
 <dd><code>fileNameBeingSplit</code> - the file being split currently. Used to generate tmp file name.</dd>
+<dd><code>tmpDirName</code> - of the directory used to sideline old recovered edits file</dd>
 <dd><code>conf</code> - </dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>Path to file into which to dump split log edits.</dd>
@@ -1215,7 +1218,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getMutationsFromWALEntry</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1847">getMutationsFromWALEntry</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WALEntry&nbsp;entry,
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1849">getMutationsFromWALEntry</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WALEntry&nbsp;entry,
                                                                         <a href="../../../../../org/apache/hadoop/hbase/CellScanner.html" title="interface in org.apache.hadoop.hbase">CellScanner</a>&nbsp;cells,
                                                                         <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.html" title="interface in org.apache.hadoop.hbase.wal">WALKey</a>,<a href="../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a>&gt;&nbsp;logEntry,
                                                                         <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a>&nbsp;durability)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html b/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
index c87aad6..1b06496 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
@@ -692,8 +692,9 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) static org.apache.hadoop.fs.Path</code></td>
-<td class="colLast"><span class="typeNameLabel">WALSplitter.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
+<td class="colLast"><span class="typeNameLabel">WALSplitter.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;fileNameBeingSplit,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tmpDirName,
                        org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
  <code>logEntry</code> named for the sequenceid in the passed

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
index a145a8d..42a03ed 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
@@ -75,13 +75,13 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>@InterfaceAudience.LimitedPrivate(value="Tools")
  @InterfaceStability.Evolving
-public final class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.57">HQuorumPeer</a>
+public final class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.59">HQuorumPeer</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">HBase's version of ZooKeeper's QuorumPeer. When HBase is set to manage
  ZooKeeper, this class is used to start up QuorumPeer instances. By doing
@@ -124,6 +124,25 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -189,6 +208,23 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.60">LOG</a></pre>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.detail">
@@ -201,7 +237,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HQuorumPeer</h4>
-<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.58">HQuorumPeer</a>()</pre>
+<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.62">HQuorumPeer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -218,7 +254,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.65">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.69">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
 <div class="block">Parse ZooKeeper configuration from HBase XML config and run a QuorumPeer.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -232,7 +268,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>runZKServer</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.85">runZKServer</a>(org.apache.zookeeper.server.quorum.QuorumPeerConfig&nbsp;zkConfig)
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.89">runZKServer</a>(org.apache.zookeeper.server.quorum.QuorumPeerConfig&nbsp;zkConfig)
                          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/net/UnknownHostException.html?is-external=true" title="class or interface in java.net">UnknownHostException</a>,
                                 <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -248,7 +284,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addressIsLocalHost</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.98">addressIsLocalHost</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;address)</pre>
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.102">addressIsLocalHost</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;address)</pre>
 </li>
 </ul>
 <a name="writeMyID-java.util.Properties-">
@@ -257,7 +293,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>writeMyID</h4>
-<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.102">writeMyID</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)
+<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.106">writeMyID</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -319,13 +355,13 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html b/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 9aa09f0..6900b04 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -306,159 +306,162 @@
 <span class="sourceLineNo">298</span>        LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.298"></a>
 <span class="sourceLineNo">299</span>        rst.join();<a name="line.299"></a>
 <span class="sourceLineNo">300</span>      } catch (InterruptedException e) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        e.printStackTrace();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    regionThreads.remove(rst);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    return rst.getName();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>  /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   * @return the HMaster thread<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   */<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public HMaster getMaster(int serverNumber) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>  /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   * Gets the current active master, if available.  If no active master, returns<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   * null.<a name="line.317"></a>
-<span class="sourceLineNo">318</span>   * @return the HMaster for the active master<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   */<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  public HMaster getActiveMaster() {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // Ensure that the current active master is not stopped.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      // We don't want to return a stopping master as an active master.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        return mt.getMaster();<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    return null;<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>  /**<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * @return Read-only list of master threads.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   */<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    return Collections.unmodifiableList(this.masterThreads);<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>   * @return List of running master servers (Some servers may have been killed<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   * this list).<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   */<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      if (mt.isAlive()) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        liveServers.add(mt);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      }<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    return liveServers;<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>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * @return Name of master that just went down.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   */<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  public String waitOnMaster(int serverNumber) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    return waitOnMaster(masterThread);<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>  /**<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @return Name of master that just went down.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   */<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    while (masterThread.isAlive()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      try {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        masterThread.join();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      } catch (InterruptedException e) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        e.printStackTrace();<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>    masterThreads.remove(masterThread);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    return masterThread.getName();<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>  /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * Wait for Mini HBase Cluster to shut down.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>  public void join() {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    if (this.regionThreads != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      for(Thread t: this.regionThreads) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        if (t.isAlive()) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          try {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            Threads.threadDumpingIsAlive(t);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          } catch (InterruptedException e) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            LOG.debug("Interrupted", e);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>          }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        }<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>    if (this.masterThreads != null) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      for (Thread t : this.masterThreads) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        if (t.isAlive()) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          try {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            Threads.threadDumpingIsAlive(t);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          } catch (InterruptedException e) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>            LOG.debug("Interrupted", e);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>          }<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>    }<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * Start the cluster.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   */<a name="line.411"></a>
-<span class="sourceLineNo">412</span>  public void startup() throws IOException {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>  /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * Shut down the mini HBase cluster<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   */<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  public void shutdown() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  /**<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   * @param c Configuration to check.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   * @return True if a 'local' address in hbase.master value.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   */<a name="line.426"></a>
-<span class="sourceLineNo">427</span>  public static boolean isLocal(final Configuration c) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  /**<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   * Test things basically work.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>   * @param args<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   * @throws IOException<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   */<a name="line.436"></a>
-<span class="sourceLineNo">437</span>  public static void main(String[] args) throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    Configuration conf = HBaseConfiguration.create();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    cluster.startup();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    Admin admin = connection.getAdmin();<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    try {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      HTableDescriptor htd =<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      admin.createTable(htd);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    } finally {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      admin.close();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    connection.close();<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    cluster.shutdown();<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">301</span>        LOG.error("Interrupted while waiting for {} to finish. Retrying join", rst.getName(), e);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        Thread.currentThread().interrupt();<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    regionThreads.remove(rst);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    return rst.getName();<a name="line.306"></a>
+<span class="sourceLineNo">307</span>  }<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>   * @return the HMaster thread<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  public HMaster getMaster(int serverNumber) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  }<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>   * Gets the current active master, if available.  If no active master, returns<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * null.<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   * @return the HMaster for the active master<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   */<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  public HMaster getActiveMaster() {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      // Ensure that the current active master is not stopped.<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // We don't want to return a stopping master as an active master.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>        return mt.getMaster();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    return null;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  /**<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @return Read-only list of master threads.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   */<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    return Collections.unmodifiableList(this.masterThreads);<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>  /**<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   * @return List of running master servers (Some servers may have been killed<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * this list).<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      if (mt.isAlive()) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        liveServers.add(mt);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    return liveServers;<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>  /**<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * @return Name of master that just went down.<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   */<a name="line.358"></a>
+<span class="sourceLineNo">359</span>  public String waitOnMaster(int serverNumber) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    return waitOnMaster(masterThread);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>  /**<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * @return Name of master that just went down.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    while (masterThread.isAlive()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>      try {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        masterThread.join();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      } catch (InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        LOG.error("Interrupted while waiting for {} to finish. Retrying join",<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            masterThread.getName(), e);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        Thread.currentThread().interrupt();<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>    masterThreads.remove(masterThread);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    return masterThread.getName();<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  }<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>   * Wait for Mini HBase Cluster to shut down.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   */<a name="line.386"></a>
+<span class="sourceLineNo">387</span>  public void join() {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    if (this.regionThreads != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      for(Thread t: this.regionThreads) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        if (t.isAlive()) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          try {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            Threads.threadDumpingIsAlive(t);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          } catch (InterruptedException e) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            LOG.debug("Interrupted", e);<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>      }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    if (this.masterThreads != null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      for (Thread t : this.masterThreads) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        if (t.isAlive()) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          try {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            Threads.threadDumpingIsAlive(t);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          } catch (InterruptedException e) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            LOG.debug("Interrupted", e);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>          }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  }<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>   * Start the cluster.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   */<a name="line.414"></a>
+<span class="sourceLineNo">415</span>  public void startup() throws IOException {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<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>  /**<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * Shut down the mini HBase cluster<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   */<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  public void shutdown() {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span>  /**<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   * @param c Configuration to check.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>   * @return True if a 'local' address in hbase.master value.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   */<a name="line.429"></a>
+<span class="sourceLineNo">430</span>  public static boolean isLocal(final Configuration c) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
+<span class="sourceLineNo">436</span>   * Test things basically work.<a name="line.436"></a>
+<span class="sourceLineNo">437</span>   * @param args<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   * @throws IOException<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   */<a name="line.439"></a>
+<span class="sourceLineNo">440</span>  public static void main(String[] args) throws IOException {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    Configuration conf = HBaseConfiguration.create();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    cluster.startup();<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    Admin admin = connection.getAdmin();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    try {<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      HTableDescriptor htd =<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      admin.createTable(htd);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    } finally {<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      admin.close();<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    connection.close();<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    cluster.shutdown();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>  }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>}<a name="line.456"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 7757245..e1ef1a3 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
 <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
 <span class="sourceLineNo">010</span>  public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span>  public static final String revision = "1114a1a65e78a00f643ef15b9a13bc710cb80845";<a name="line.11"></a>
+<span class="sourceLineNo">011</span>  public static final String revision = "092efb42749bf7fc6ad338c96aae8e7b9d3a2c74";<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String date = "Wed Aug 15 14:39:17 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String date = "Thu Aug 16 14:38:56 UTC 2018";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String srcChecksum = "b03e26b326c47068ee3c2d38b4181ca8";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String srcChecksum = "ea011180320b95ba2577dbbea3f2ed3d";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>}<a name="line.16"></a>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
index 4b58ed2..73fb9dc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
@@ -188,7 +188,7 @@
 <span class="sourceLineNo">180</span>      client.restore(BackupUtils.createRestoreRequest(backupRootDir, backupId, check,<a name="line.180"></a>
 <span class="sourceLineNo">181</span>        sTableArray, tTableArray, overwrite));<a name="line.181"></a>
 <span class="sourceLineNo">182</span>    } catch (Exception e) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      e.printStackTrace();<a name="line.183"></a>
+<span class="sourceLineNo">183</span>      LOG.error("Error while running restore backup", e);<a name="line.183"></a>
 <span class="sourceLineNo">184</span>      return -5;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
 <span class="sourceLineNo">186</span>    return 0;<a name="line.186"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
index 1c85f39..08653af 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
@@ -154,53 +154,52 @@
 <span class="sourceLineNo">146</span>    // Rethrow the exception so the application can handle it.<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    while (!exceptionsQueue.isEmpty()) {<a name="line.147"></a>
 <span class="sourceLineNo">148</span>      Exception first = exceptionsQueue.peek();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      first.printStackTrace();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      if (first instanceof IOException) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        throw (IOException) first;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      throw (RuntimeException) first;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  private boolean prefetchCondition() {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return cacheSizeInBytes.get() &lt; maxCacheSize / 2;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  private Result pollCache() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    Result res = cache.poll();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    long estimatedSize = calcEstimatedSize(res);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    addEstimatedSize(-estimatedSize);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return res;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private class PrefetchRunnable implements Runnable {<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>    @Override<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public void run() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      while (!closed) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        boolean succeed = false;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        try {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          lock.lock();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>          while (!prefetchCondition()) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            notFull.await();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>          loadCache();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>          succeed = true;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        } catch (Exception e) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>          exceptionsQueue.add(e);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        } finally {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>          notEmpty.signalAll();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          lock.unlock();<a name="line.185"></a>
-<span class="sourceLineNo">186</span>          if (prefetchListener != null) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>            prefetchListener.accept(succeed);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>          }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>}<a name="line.195"></a>
+<span class="sourceLineNo">149</span>      if (first instanceof IOException) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        throw (IOException) first;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      throw (RuntimeException) first;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  private boolean prefetchCondition() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return cacheSizeInBytes.get() &lt; maxCacheSize / 2;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  private Result pollCache() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    Result res = cache.poll();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    long estimatedSize = calcEstimatedSize(res);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    addEstimatedSize(-estimatedSize);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return res;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  private class PrefetchRunnable implements Runnable {<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>    @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    public void run() {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      while (!closed) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        boolean succeed = false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        try {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          lock.lock();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          while (!prefetchCondition()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            notFull.await();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>          }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          loadCache();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          succeed = true;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        } catch (Exception e) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>          exceptionsQueue.add(e);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        } finally {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          notEmpty.signalAll();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          lock.unlock();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          if (prefetchListener != null) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            prefetchListener.accept(succeed);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>}<a name="line.194"></a>
 
 
 


[26/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.append(sourceCf + ":" + destCf);<a name="line.583"></a>
+<span class="sourc

<TRUNCATED>

[50/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 8fd675f..2950fc7 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.47">TsvImporterMapper</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.49">TsvImporterMapper</a>
 extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,org.apache.hadoop.io.Text,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&gt;</pre>
 <div class="block">Write table content out to files in hdfs.</div>
 </li>
@@ -272,7 +272,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>ts</h4>
-<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.52">ts</a></pre>
+<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.54">ts</a></pre>
 <div class="block">Timestamp for all inserted rows</div>
 </li>
 </ul>
@@ -282,7 +282,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>parser</h4>
-<pre>protected&nbsp;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&nbsp;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">
@@ -291,7 +291,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>conf</h4>
-<pre>protected&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.66">conf</a></pre>
+<pre>protected&nbsp;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">
@@ -300,7 +300,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>cellVisibilityExpr</h4>
-<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/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&nbsp;<a href="https://docs.oracle.com/javase/8/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">
@@ -309,7 +309,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>ttl</h4>
-<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.70">ttl</a></pre>
+<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.72">ttl</a></pre>
 </li>
 </ul>
 <a name="kvCreator">
@@ -318,7 +318,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>kvCreator</h4>
-<pre>protected&nbsp;<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&nbsp;<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>
@@ -335,7 +335,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TsvImporterMapper</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.47">TsvImporterMapper</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.49">TsvImporterMapper</a>()</pre>
 </li>
 </ul>
 </li>
@@ -352,7 +352,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getTs</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.79">getTs</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.81">getTs</a>()</pre>
 </li>
 </ul>
 <a name="getSkipBadLines--">
@@ -361,7 +361,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getSkipBadLines</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.83">getSkipBadLines</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.85">getSkipBadLines</a>()</pre>
 </li>
 </ul>
 <a name="getBadLineCount--">
@@ -370,7 +370,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getBadLineCount</h4>
-<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.87">getBadLineCount</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.89">getBadLineCount</a>()</pre>
 </li>
 </ul>
 <a name="incrementBadLineCount-int-">
@@ -379,7 +379,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementBadLineCount</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.91">incrementBadLineCount</a>(int&nbsp;count)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.93">incrementBadLineCount</a>(int&nbsp;count)</pre>
 </li>
 </ul>
 <a name="setup-org.apache.hadoop.mapreduce.Mapper.Context-">
@@ -388,7 +388,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>setup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.104">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.106">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;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
@@ -407,7 +407,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>doSetup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.121">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.123">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
 <div class="block">Handles common parameter initialization that a subclass might want to leverage.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -421,7 +421,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.149">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.151">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
                 org.apache.hadoop.io.Text&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -440,7 +440,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>populatePut</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.206">populatePut</a>(byte[]&nbsp;lineBytes,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.209">populatePut</a>(byte[]&nbsp;lineBytes,
                            org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.ParsedLine&nbsp;parsed,
                            <a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
                            int&nbsp;i)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html b/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
index 8b5b32b..6de80a0 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.36">TsvImporterTextMapper</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.38">TsvImporterTextMapper</a>
 extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,org.apache.hadoop.io.Text,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,org.apache.hadoop.io.Text&gt;</pre>
 <div class="block">Write table content out to map output files.</div>
 </li>
@@ -220,7 +220,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TsvImporterTextMapper</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.36">TsvImporterTextMapper</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.38">TsvImporterTextMapper</a>()</pre>
 </li>
 </ul>
 </li>
@@ -237,7 +237,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getSkipBadLines</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.50">getSkipBadLines</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.52">getSkipBadLines</a>()</pre>
 </li>
 </ul>
 <a name="getBadLineCount--">
@@ -246,7 +246,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getBadLineCount</h4>
-<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.54">getBadLineCount</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.56">getBadLineCount</a>()</pre>
 </li>
 </ul>
 <a name="incrementBadLineCount-int-">
@@ -255,7 +255,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementBadLineCount</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.58">incrementBadLineCount</a>(int&nbsp;count)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.60">incrementBadLineCount</a>(int&nbsp;count)</pre>
 </li>
 </ul>
 <a name="setup-org.apache.hadoop.mapreduce.Mapper.Context-">
@@ -264,7 +264,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>setup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.71">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.73">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;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 subclass is done in
  <code>doSetup</code>. Hence a subclass may choose to override this method
@@ -283,7 +283,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>doSetup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.86">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.88">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
 <div class="block">Handles common parameter initialization that a subclass might want to leverage.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -297,7 +297,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.107">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.109">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
                 org.apache.hadoop.io.Text&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html b/apidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
index 0b077d2..ae2d067 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
@@ -397,7 +397,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSubmittableJob</h4>
-<pre>public&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.267">createSubmittableJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.269">createSubmittableJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets up the actual job.</div>
 <dl>
@@ -416,7 +416,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.382">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.384">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>
@@ -433,7 +433,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.388">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.390">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 9aa09f0..6900b04 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -306,159 +306,162 @@
 <span class="sourceLineNo">298</span>        LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.298"></a>
 <span class="sourceLineNo">299</span>        rst.join();<a name="line.299"></a>
 <span class="sourceLineNo">300</span>      } catch (InterruptedException e) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        e.printStackTrace();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    regionThreads.remove(rst);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    return rst.getName();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>  /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   * @return the HMaster thread<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   */<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public HMaster getMaster(int serverNumber) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>  /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   * Gets the current active master, if available.  If no active master, returns<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   * null.<a name="line.317"></a>
-<span class="sourceLineNo">318</span>   * @return the HMaster for the active master<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   */<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  public HMaster getActiveMaster() {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // Ensure that the current active master is not stopped.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      // We don't want to return a stopping master as an active master.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        return mt.getMaster();<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    return null;<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>  /**<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * @return Read-only list of master threads.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   */<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    return Collections.unmodifiableList(this.masterThreads);<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>   * @return List of running master servers (Some servers may have been killed<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   * this list).<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   */<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      if (mt.isAlive()) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        liveServers.add(mt);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      }<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    return liveServers;<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>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * @return Name of master that just went down.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   */<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  public String waitOnMaster(int serverNumber) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    return waitOnMaster(masterThread);<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>  /**<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @return Name of master that just went down.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   */<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    while (masterThread.isAlive()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      try {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        masterThread.join();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      } catch (InterruptedException e) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        e.printStackTrace();<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>    masterThreads.remove(masterThread);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    return masterThread.getName();<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>  /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * Wait for Mini HBase Cluster to shut down.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>  public void join() {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    if (this.regionThreads != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      for(Thread t: this.regionThreads) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        if (t.isAlive()) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          try {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            Threads.threadDumpingIsAlive(t);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          } catch (InterruptedException e) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            LOG.debug("Interrupted", e);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>          }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        }<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>    if (this.masterThreads != null) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      for (Thread t : this.masterThreads) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        if (t.isAlive()) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          try {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            Threads.threadDumpingIsAlive(t);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          } catch (InterruptedException e) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>            LOG.debug("Interrupted", e);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>          }<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>    }<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * Start the cluster.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   */<a name="line.411"></a>
-<span class="sourceLineNo">412</span>  public void startup() throws IOException {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>  /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * Shut down the mini HBase cluster<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   */<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  public void shutdown() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  /**<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   * @param c Configuration to check.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   * @return True if a 'local' address in hbase.master value.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   */<a name="line.426"></a>
-<span class="sourceLineNo">427</span>  public static boolean isLocal(final Configuration c) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  /**<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   * Test things basically work.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>   * @param args<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   * @throws IOException<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   */<a name="line.436"></a>
-<span class="sourceLineNo">437</span>  public static void main(String[] args) throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    Configuration conf = HBaseConfiguration.create();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    cluster.startup();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    Admin admin = connection.getAdmin();<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    try {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      HTableDescriptor htd =<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      admin.createTable(htd);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    } finally {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      admin.close();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    connection.close();<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    cluster.shutdown();<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">301</span>        LOG.error("Interrupted while waiting for {} to finish. Retrying join", rst.getName(), e);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        Thread.currentThread().interrupt();<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    regionThreads.remove(rst);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    return rst.getName();<a name="line.306"></a>
+<span class="sourceLineNo">307</span>  }<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>   * @return the HMaster thread<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  public HMaster getMaster(int serverNumber) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  }<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>   * Gets the current active master, if available.  If no active master, returns<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * null.<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   * @return the HMaster for the active master<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   */<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  public HMaster getActiveMaster() {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      // Ensure that the current active master is not stopped.<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // We don't want to return a stopping master as an active master.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>        return mt.getMaster();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    return null;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  /**<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @return Read-only list of master threads.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   */<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    return Collections.unmodifiableList(this.masterThreads);<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>  /**<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   * @return List of running master servers (Some servers may have been killed<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * this list).<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      if (mt.isAlive()) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        liveServers.add(mt);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    return liveServers;<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>  /**<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * @return Name of master that just went down.<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   */<a name="line.358"></a>
+<span class="sourceLineNo">359</span>  public String waitOnMaster(int serverNumber) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    return waitOnMaster(masterThread);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>  /**<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * @return Name of master that just went down.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    while (masterThread.isAlive()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>      try {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        masterThread.join();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      } catch (InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        LOG.error("Interrupted while waiting for {} to finish. Retrying join",<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            masterThread.getName(), e);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        Thread.currentThread().interrupt();<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>    masterThreads.remove(masterThread);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    return masterThread.getName();<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  }<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>   * Wait for Mini HBase Cluster to shut down.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   */<a name="line.386"></a>
+<span class="sourceLineNo">387</span>  public void join() {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    if (this.regionThreads != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      for(Thread t: this.regionThreads) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        if (t.isAlive()) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          try {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            Threads.threadDumpingIsAlive(t);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          } catch (InterruptedException e) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            LOG.debug("Interrupted", e);<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>      }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    if (this.masterThreads != null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      for (Thread t : this.masterThreads) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        if (t.isAlive()) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          try {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            Threads.threadDumpingIsAlive(t);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          } catch (InterruptedException e) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            LOG.debug("Interrupted", e);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>          }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  }<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>   * Start the cluster.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   */<a name="line.414"></a>
+<span class="sourceLineNo">415</span>  public void startup() throws IOException {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<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>  /**<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * Shut down the mini HBase cluster<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   */<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  public void shutdown() {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span>  /**<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   * @param c Configuration to check.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>   * @return True if a 'local' address in hbase.master value.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   */<a name="line.429"></a>
+<span class="sourceLineNo">430</span>  public static boolean isLocal(final Configuration c) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
+<span class="sourceLineNo">436</span>   * Test things basically work.<a name="line.436"></a>
+<span class="sourceLineNo">437</span>   * @param args<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   * @throws IOException<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   */<a name="line.439"></a>
+<span class="sourceLineNo">440</span>  public static void main(String[] args) throws IOException {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    Configuration conf = HBaseConfiguration.create();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    cluster.startup();<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    Admin admin = connection.getAdmin();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    try {<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      HTableDescriptor htd =<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      admin.createTable(htd);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    } finally {<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      admin.close();<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    connection.close();<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    cluster.shutdown();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>  }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>}<a name="line.456"></a>
 
 
 


[49/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
index d98b2a6..8fc079d 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
@@ -252,660 +252,661 @@
 <span class="sourceLineNo">244</span>    throws CharacterCodingException {<a name="line.244"></a>
 <span class="sourceLineNo">245</span><a name="line.245"></a>
 <span class="sourceLineNo">246</span>    String filterName = Bytes.toString(getFilterName(filterStringAsByteArray));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    ArrayList&lt;byte []&gt; filterArguments = getFilterArguments(filterStringAsByteArray);<a name="line.247"></a>
+<span class="sourceLineNo">247</span>    ArrayList&lt;byte[]&gt; filterArguments = getFilterArguments(filterStringAsByteArray);<a name="line.247"></a>
 <span class="sourceLineNo">248</span>    if (!filterHashMap.containsKey(filterName)) {<a name="line.248"></a>
 <span class="sourceLineNo">249</span>      throw new IllegalArgumentException("Filter Name " + filterName + " not supported");<a name="line.249"></a>
 <span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    try {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      filterName = filterHashMap.get(filterName);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      Class&lt;?&gt; c = Class.forName(filterName);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      Class&lt;?&gt;[] argTypes = new Class [] {ArrayList.class};<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      Method m = c.getDeclaredMethod("createFilterFromArguments", argTypes);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return (Filter) m.invoke(null,filterArguments);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    } catch (ClassNotFoundException e) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      e.printStackTrace();<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    } catch (NoSuchMethodException e) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      e.printStackTrace();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    } catch (IllegalAccessException e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      e.printStackTrace();<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } catch (InvocationTargetException e) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      e.printStackTrace();<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    throw new IllegalArgumentException("Incorrect filter string " +<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        new String(filterStringAsByteArray, StandardCharsets.UTF_8));<a name="line.267"></a>
-<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>/**<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * Returns the filter name given a simple filter expression<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * &lt;p&gt;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * @param filterStringAsByteArray a simple filter expression<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * @return name of filter in the simple filter expression<a name="line.274"></a>
-<span class="sourceLineNo">275</span> */<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public static byte [] getFilterName (byte [] filterStringAsByteArray) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    int filterNameStartIndex = 0;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    int filterNameEndIndex = 0;<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    for (int i=filterNameStartIndex; i&lt;filterStringAsByteArray.length; i++) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      if (filterStringAsByteArray[i] == ParseConstants.LPAREN ||<a name="line.281"></a>
-<span class="sourceLineNo">282</span>          filterStringAsByteArray[i] == ParseConstants.WHITESPACE) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        filterNameEndIndex = i;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        break;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      }<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    if (filterNameEndIndex == 0) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      throw new IllegalArgumentException("Incorrect Filter Name");<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>    byte [] filterName = new byte[filterNameEndIndex - filterNameStartIndex];<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    Bytes.putBytes(filterName, 0, filterStringAsByteArray, 0,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>                   filterNameEndIndex - filterNameStartIndex);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    return filterName;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>/**<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * Returns the arguments of the filter from the filter string<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * &lt;p&gt;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * @param filterStringAsByteArray filter string given by the user<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @return an ArrayList containing the arguments of the filter in the filter string<a name="line.302"></a>
-<span class="sourceLineNo">303</span> */<a name="line.303"></a>
-<span class="sourceLineNo">304</span>  public static ArrayList&lt;byte []&gt; getFilterArguments (byte [] filterStringAsByteArray) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    int argumentListStartIndex = Bytes.searchDelimiterIndex(filterStringAsByteArray, 0,<a name="line.305"></a>
-<span class="sourceLineNo">306</span>                                                       filterStringAsByteArray.length,<a name="line.306"></a>
-<span class="sourceLineNo">307</span>                                                       ParseConstants.LPAREN);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    if (argumentListStartIndex == -1) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      throw new IllegalArgumentException("Incorrect argument list");<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>    int argumentStartIndex = 0;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    int argumentEndIndex = 0;<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    ArrayList&lt;byte []&gt; filterArguments = new ArrayList&lt;&gt;();<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>    for (int i = argumentListStartIndex + 1; i&lt;filterStringAsByteArray.length; i++) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>      if (filterStringAsByteArray[i] == ParseConstants.WHITESPACE ||<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          filterStringAsByteArray[i] == ParseConstants.COMMA ||<a name="line.319"></a>
-<span class="sourceLineNo">320</span>          filterStringAsByteArray[i] == ParseConstants.RPAREN) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        continue;<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>      // The argument is in single quotes - for example 'prefix'<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        argumentStartIndex = i;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>        for (int j = argumentStartIndex+1; j &lt; filterStringAsByteArray.length; j++) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>          if (filterStringAsByteArray[j] == ParseConstants.SINGLE_QUOTE) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>            if (isQuoteUnescaped(filterStringAsByteArray,j)) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>              argumentEndIndex = j;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>              i = j+1;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>              byte [] filterArgument = createUnescapdArgument(filterStringAsByteArray,<a name="line.332"></a>
-<span class="sourceLineNo">333</span>                                                              argumentStartIndex, argumentEndIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>              filterArguments.add(filterArgument);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>              break;<a name="line.335"></a>
-<span class="sourceLineNo">336</span>            } else {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>              // To jump over the second escaped quote<a name="line.337"></a>
-<span class="sourceLineNo">338</span>              j++;<a name="line.338"></a>
-<span class="sourceLineNo">339</span>            }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>            throw new IllegalArgumentException("Incorrect argument list");<a name="line.341"></a>
-<span class="sourceLineNo">342</span>          }<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        }<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      } else {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // The argument is an integer, boolean, comparison operator like &lt;, &gt;, != etc<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        argumentStartIndex = i;<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        for (int j = argumentStartIndex; j &lt; filterStringAsByteArray.length; j++) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>          if (filterStringAsByteArray[j] == ParseConstants.WHITESPACE ||<a name="line.348"></a>
-<span class="sourceLineNo">349</span>              filterStringAsByteArray[j] == ParseConstants.COMMA ||<a name="line.349"></a>
-<span class="sourceLineNo">350</span>              filterStringAsByteArray[j] == ParseConstants.RPAREN) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>            argumentEndIndex = j - 1;<a name="line.351"></a>
-<span class="sourceLineNo">352</span>            i = j;<a name="line.352"></a>
-<span class="sourceLineNo">353</span>            byte [] filterArgument = new byte [argumentEndIndex - argumentStartIndex + 1];<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            Bytes.putBytes(filterArgument, 0, filterStringAsByteArray,<a name="line.354"></a>
-<span class="sourceLineNo">355</span>                           argumentStartIndex, argumentEndIndex - argumentStartIndex + 1);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            filterArguments.add(filterArgument);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            break;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>            throw new IllegalArgumentException("Incorrect argument list");<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>    }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    return filterArguments;<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>/**<a name="line.367"></a>
-<span class="sourceLineNo">368</span> * This function is called while parsing the filterString and an operator is parsed<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * &lt;p&gt;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * @param operatorStack the stack containing the operators and parenthesis<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * @param filterStack the stack containing the filters<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @param operator the operator found while parsing the filterString<a name="line.372"></a>
-<span class="sourceLineNo">373</span> */<a name="line.373"></a>
-<span class="sourceLineNo">374</span>  public void reduce(Stack&lt;ByteBuffer&gt; operatorStack,<a name="line.374"></a>
-<span class="sourceLineNo">375</span>                     Stack&lt;Filter&gt; filterStack,<a name="line.375"></a>
-<span class="sourceLineNo">376</span>                     ByteBuffer operator) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    while (!operatorStack.empty() &amp;&amp;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>           !(ParseConstants.LPAREN_BUFFER.equals(operatorStack.peek())) &amp;&amp;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>           hasHigherPriority(operatorStack.peek(), operator)) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      filterStack.push(popArguments(operatorStack, filterStack));<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    }<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>  /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Pops an argument from the operator stack and the number of arguments required by the operator<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * from the filterStack and evaluates them<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * &lt;p&gt;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param operatorStack the stack containing the operators<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @param filterStack the stack containing the filters<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   * @return the evaluated filter<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   */<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  public static Filter popArguments (Stack&lt;ByteBuffer&gt; operatorStack, Stack &lt;Filter&gt; filterStack) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    ByteBuffer argumentOnTopOfStack = operatorStack.peek();<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span>    if (argumentOnTopOfStack.equals(ParseConstants.OR_BUFFER)) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      // The top of the stack is an OR<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      try {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.OR_BUFFER)) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>          Filter filter = filterStack.pop();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          listOfFilters.add(0, filter);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          operatorStack.pop();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        }<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        Filter filter = filterStack.pop();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        listOfFilters.add(0, filter);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        Filter orFilter = new FilterList(FilterList.Operator.MUST_PASS_ONE, listOfFilters);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        return orFilter;<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      } catch (EmptyStackException e) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        throw new IllegalArgumentException("Incorrect input string - an OR needs two filters");<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.AND_BUFFER)) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      // The top of the stack is an AND<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      try {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.AND_BUFFER)) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>          Filter filter = filterStack.pop();<a name="line.417"></a>
-<span class="sourceLineNo">418</span>          listOfFilters.add(0, filter);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>          operatorStack.pop();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        Filter filter = filterStack.pop();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>        listOfFilters.add(0, filter);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>        Filter andFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL, listOfFilters);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        return andFilter;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } catch (EmptyStackException e) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        throw new IllegalArgumentException("Incorrect input string - an AND needs two filters");<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.SKIP_BUFFER)) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      // The top of the stack is a SKIP<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      try {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        Filter wrappedFilter = filterStack.pop();<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        Filter skipFilter = new SkipFilter(wrappedFilter);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        operatorStack.pop();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        return skipFilter;<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      } catch (EmptyStackException e) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        throw new IllegalArgumentException("Incorrect input string - a SKIP wraps a filter");<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>    } else if (argumentOnTopOfStack.equals(ParseConstants.WHILE_BUFFER)) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      // The top of the stack is a WHILE<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      try {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        Filter wrappedFilter = filterStack.pop();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        Filter whileMatchFilter = new WhileMatchFilter(wrappedFilter);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        operatorStack.pop();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        return whileMatchFilter;<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      } catch (EmptyStackException e) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        throw new IllegalArgumentException("Incorrect input string - a WHILE wraps a filter");<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.LPAREN_BUFFER)) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      // The top of the stack is a LPAREN<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      try {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        Filter filter  = filterStack.pop();<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        operatorStack.pop();<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        return filter;<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      } catch (EmptyStackException e) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>        throw new IllegalArgumentException("Incorrect Filter String");<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>    } else {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      throw new IllegalArgumentException("Incorrect arguments on operatorStack");<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    }<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span>/**<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * Returns which operator has higher precedence<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * &lt;p&gt;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * If a has higher precedence than b, it returns true<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * If they have the same precedence, it returns false<a name="line.470"></a>
-<span class="sourceLineNo">471</span> */<a name="line.471"></a>
-<span class="sourceLineNo">472</span>  public boolean hasHigherPriority(ByteBuffer a, ByteBuffer b) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    if ((operatorPrecedenceHashMap.get(a) - operatorPrecedenceHashMap.get(b)) &lt; 0) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      return true;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    }<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    return false;<a name="line.476"></a>
-<span class="sourceLineNo">477</span>  }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span>/**<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * Removes the single quote escaping a single quote - thus it returns an unescaped argument<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * &lt;p&gt;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> * @param filterStringAsByteArray filter string given by user<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @param argumentStartIndex start index of the argument<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @param argumentEndIndex end index of the argument<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return returns an unescaped argument<a name="line.485"></a>
-<span class="sourceLineNo">486</span> */<a name="line.486"></a>
-<span class="sourceLineNo">487</span>  public static byte [] createUnescapdArgument (byte [] filterStringAsByteArray,<a name="line.487"></a>
-<span class="sourceLineNo">488</span>                                                int argumentStartIndex, int argumentEndIndex) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    int unescapedArgumentLength = 2;<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      unescapedArgumentLength ++;<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.492"></a>
-<span class="sourceLineNo">493</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          filterStringAsByteArray[i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>        i++;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        continue;<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><a name="line.499"></a>
-<span class="sourceLineNo">500</span>    byte [] unescapedArgument = new byte [unescapedArgumentLength];<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    int count = 1;<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    unescapedArgument[0] = '\'';<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      if (filterStringAsByteArray [i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.504"></a>
-<span class="sourceLineNo">505</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          filterStringAsByteArray [i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>        unescapedArgument[count++] = filterStringAsByteArray [i+1];<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        i++;<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>        unescapedArgument[count++] = filterStringAsByteArray [i];<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    }<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    unescapedArgument[unescapedArgumentLength - 1] = '\'';<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    return unescapedArgument;<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>/**<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'OR'<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * &lt;p&gt;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * @param filterStringAsByteArray filter string given by the user<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * @param indexOfOr index at which an 'O' was read<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * @return true if the keyword 'OR' is at the current index<a name="line.523"></a>
-<span class="sourceLineNo">524</span> */<a name="line.524"></a>
-<span class="sourceLineNo">525</span>  public static boolean checkForOr (byte [] filterStringAsByteArray, int indexOfOr)<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    throws CharacterCodingException, ArrayIndexOutOfBoundsException {<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span>    try {<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      if (filterStringAsByteArray[indexOfOr] == ParseConstants.O &amp;&amp;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>          filterStringAsByteArray[indexOfOr+1] == ParseConstants.R &amp;&amp;<a name="line.530"></a>
-<span class="sourceLineNo">531</span>          (filterStringAsByteArray[indexOfOr-1] == ParseConstants.WHITESPACE ||<a name="line.531"></a>
-<span class="sourceLineNo">532</span>           filterStringAsByteArray[indexOfOr-1] == ParseConstants.RPAREN) &amp;&amp;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>          (filterStringAsByteArray[indexOfOr+2] == ParseConstants.WHITESPACE ||<a name="line.533"></a>
-<span class="sourceLineNo">534</span>           filterStringAsByteArray[indexOfOr+2] == ParseConstants.LPAREN)) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>        return true;<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      } else {<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        return false;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      }<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return false;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>  }<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>/**<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'AND'<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * &lt;p&gt;<a name="line.546"></a>
-<span class="sourceLineNo">547</span> * @param filterStringAsByteArray filter string given by the user<a name="line.547"></a>
-<span class="sourceLineNo">548</span> * @param indexOfAnd index at which an 'A' was read<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * @return true if the keyword 'AND' is at the current index<a name="line.549"></a>
-<span class="sourceLineNo">550</span> */<a name="line.550"></a>
-<span class="sourceLineNo">551</span>  public static boolean checkForAnd (byte [] filterStringAsByteArray, int indexOfAnd)<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    throws CharacterCodingException {<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span>    try {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      if (filterStringAsByteArray[indexOfAnd] == ParseConstants.A &amp;&amp;<a name="line.555"></a>
-<span class="sourceLineNo">556</span>          filterStringAsByteArray[indexOfAnd+1] == ParseConstants.N &amp;&amp;<a name="line.556"></a>
-<span class="sourceLineNo">557</span>          filterStringAsByteArray[indexOfAnd+2] == ParseConstants.D &amp;&amp;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>          (filterStringAsByteArray[indexOfAnd-1] == ParseConstants.WHITESPACE ||<a name="line.558"></a>
-<span class="sourceLineNo">559</span>           filterStringAsByteArray[indexOfAnd-1] == ParseConstants.RPAREN) &amp;&amp;<a name="line.559"></a>
-<span class="sourceLineNo">560</span>          (filterStringAsByteArray[indexOfAnd+3] == ParseConstants.WHITESPACE ||<a name="line.560"></a>
-<span class="sourceLineNo">561</span>           filterStringAsByteArray[indexOfAnd+3] == ParseConstants.LPAREN)) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>        return true;<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      } else {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        return false;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      }<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      return false;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    }<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>
-<span class="sourceLineNo">572</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'SKIP'<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * &lt;p&gt;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * @param filterStringAsByteArray filter string given by the user<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * @param indexOfSkip index at which an 'S' was read<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @return true if the keyword 'SKIP' is at the current index<a name="line.576"></a>
-<span class="sourceLineNo">577</span> */<a name="line.577"></a>
-<span class="sourceLineNo">578</span>  public static boolean checkForSkip (byte [] filterStringAsByteArray, int indexOfSkip)<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    throws CharacterCodingException {<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>    try {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      if (filterStringAsByteArray[indexOfSkip] == ParseConstants.S &amp;&amp;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>          filterStringAsByteArray[indexOfSkip+1] == ParseConstants.K &amp;&amp;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>          filterStringAsByteArray[indexOfSkip+2] == ParseConstants.I &amp;&amp;<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          filterStringAsByteArray[indexOfSkip+3] == ParseConstants.P &amp;&amp;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>          (indexOfSkip == 0 ||<a name="line.586"></a>
-<span class="sourceLineNo">587</span>           filterStringAsByteArray[indexOfSkip-1] == ParseConstants.WHITESPACE ||<a name="line.587"></a>
-<span class="sourceLineNo">588</span>           filterStringAsByteArray[indexOfSkip-1] == ParseConstants.RPAREN ||<a name="line.588"></a>
-<span class="sourceLineNo">589</span>           filterStringAsByteArray[indexOfSkip-1] == ParseConstants.LPAREN) &amp;&amp;<a name="line.589"></a>
-<span class="sourceLineNo">590</span>          (filterStringAsByteArray[indexOfSkip+4] == ParseConstants.WHITESPACE ||<a name="line.590"></a>
-<span class="sourceLineNo">591</span>           filterStringAsByteArray[indexOfSkip+4] == ParseConstants.LPAREN)) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        return true;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      } else {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        return false;<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return false;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>  }<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>/**<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'WHILE'<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * &lt;p&gt;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @param filterStringAsByteArray filter string given by the user<a name="line.604"></a>
-<span class="sourceLineNo">605</span> * @param indexOfWhile index at which an 'W' was read<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * @return true if the keyword 'WHILE' is at the current index<a name="line.606"></a>
-<span class="sourceLineNo">607</span> */<a name="line.607"></a>
-<span class="sourceLineNo">608</span>  public static boolean checkForWhile (byte [] filterStringAsByteArray, int indexOfWhile)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    throws CharacterCodingException {<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span>    try {<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      if (filterStringAsByteArray[indexOfWhile] == ParseConstants.W &amp;&amp;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>          filterStringAsByteArray[indexOfWhile+1] == ParseConstants.H &amp;&amp;<a name="line.613"></a>
-<span class="sourceLineNo">614</span>          filterStringAsByteArray[indexOfWhile+2] == ParseConstants.I &amp;&amp;<a name="line.614"></a>
-<span class="sourceLineNo">615</span>          filterStringAsByteArray[indexOfWhile+3] == ParseConstants.L &amp;&amp;<a name="line.615"></a>
-<span class="sourceLineNo">616</span>          filterStringAsByteArray[indexOfWhile+4] == ParseConstants.E &amp;&amp;<a name="line.616"></a>
-<span class="sourceLineNo">617</span>          (indexOfWhile == 0 || filterStringAsByteArray[indexOfWhile-1] == ParseConstants.WHITESPACE<a name="line.617"></a>
-<span class="sourceLineNo">618</span>           || filterStringAsByteArray[indexOfWhile-1] == ParseConstants.RPAREN ||<a name="line.618"></a>
-<span class="sourceLineNo">619</span>           filterStringAsByteArray[indexOfWhile-1] == ParseConstants.LPAREN) &amp;&amp;<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          (filterStringAsByteArray[indexOfWhile+5] == ParseConstants.WHITESPACE ||<a name="line.620"></a>
-<span class="sourceLineNo">621</span>           filterStringAsByteArray[indexOfWhile+5] == ParseConstants.LPAREN)) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>        return true;<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      } else {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>        return false;<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      }<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      return false;<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>  }<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span>/**<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Returns a boolean indicating whether the quote was escaped or not<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * &lt;p&gt;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param array byte array in which the quote was found<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @param quoteIndex index of the single quote<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @return returns true if the quote was unescaped<a name="line.636"></a>
-<span class="sourceLineNo">637</span> */<a name="line.637"></a>
-<span class="sourceLineNo">638</span>  public static boolean isQuoteUnescaped (byte [] array, int quoteIndex) {<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    if (array == null) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      throw new IllegalArgumentException("isQuoteUnescaped called with a null array");<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>    if (quoteIndex == array.length - 1 || array[quoteIndex+1] != ParseConstants.SINGLE_QUOTE) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      return true;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    }<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    else {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      return false;<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>  }<a name="line.649"></a>
-<span class="sourceLineNo">650</span><a name="line.650"></a>
-<span class="sourceLineNo">651</span>/**<a name="line.651"></a>
-<span class="sourceLineNo">652</span> * Takes a quoted byte array and converts it into an unquoted byte array<a name="line.652"></a>
-<span class="sourceLineNo">653</span> * For example: given a byte array representing 'abc', it returns a<a name="line.653"></a>
-<span class="sourceLineNo">654</span> * byte array representing abc<a name="line.654"></a>
-<span class="sourceLineNo">655</span> * &lt;p&gt;<a name="line.655"></a>
-<span class="sourceLineNo">656</span> * @param quotedByteArray the quoted byte array<a name="line.656"></a>
-<span class="sourceLineNo">657</span> * @return Unquoted byte array<a name="line.657"></a>
-<span class="sourceLineNo">658</span> */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  public static byte [] removeQuotesFromByteArray (byte [] quotedByteArray) {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    if (quotedByteArray == null ||<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        quotedByteArray.length &lt; 2 ||<a name="line.661"></a>
-<span class="sourceLineNo">662</span>        quotedByteArray[0] != ParseConstants.SINGLE_QUOTE ||<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        quotedByteArray[quotedByteArray.length - 1] != ParseConstants.SINGLE_QUOTE) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      throw new IllegalArgumentException("removeQuotesFromByteArray needs a quoted byte array");<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    } else {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      byte [] targetString = new byte [quotedByteArray.length - 2];<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      Bytes.putBytes(targetString, 0, quotedByteArray, 1, quotedByteArray.length - 2);<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      return targetString;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
-<span class="sourceLineNo">670</span>  }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>/**<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * Converts an int expressed in a byte array to an actual int<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * &lt;p&gt;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * This doesn't use Bytes.toInt because that assumes<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * that there will be {@link Bytes#SIZEOF_INT} bytes available.<a name="line.676"></a>
-<span class="sourceLineNo">677</span> * &lt;p&gt;<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * @param numberAsByteArray the int value expressed as a byte array<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * @return the int value<a name="line.679"></a>
-<span class="sourceLineNo">680</span> */<a name="line.680"></a>
-<span class="sourceLineNo">681</span>  public static int convertByteArrayToInt (byte [] numberAsByteArray) {<a name="line.681"></a>
-<span class="sourceLineNo">682</span><a name="line.682"></a>
-<span class="sourceLineNo">683</span>    long tempResult = ParseFilter.convertByteArrayToLong(numberAsByteArray);<a name="line.683"></a>
-<span class="sourceLineNo">684</span><a name="line.684"></a>
-<span class="sourceLineNo">685</span>    if (tempResult &gt; Integer.MAX_VALUE) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      throw new IllegalArgumentException("Integer Argument too large");<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    } else if (tempResult &lt; Integer.MIN_VALUE) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      throw new IllegalArgumentException("Integer Argument too small");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>    int result = (int) tempResult;<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    return result;<a name="line.692"></a>
-<span class="sourceLineNo">693</span>  }<a name="line.693"></a>
-<span class="sourceLineNo">694</span><a name="line.694"></a>
-<span class="sourceLineNo">695</span>/**<a name="line.695"></a>
-<span class="sourceLineNo">696</span> * Converts a long expressed in a byte array to an actual long<a name="line.696"></a>
-<span class="sourceLineNo">697</span> * &lt;p&gt;<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * This doesn't use Bytes.toLong because that assumes<a name="line.698"></a>
-<span class="sourceLineNo">699</span> * that there will be {@link Bytes#SIZEOF_INT} bytes available.<a name="line.699"></a>
-<span class="sourceLineNo">700</span> * &lt;p&gt;<a name="line.700"></a>
-<span class="sourceLineNo">701</span> * @param numberAsByteArray the long value expressed as a byte array<a name="line.701"></a>
-<span class="sourceLineNo">702</span> * @return the long value<a name="line.702"></a>
-<span class="sourceLineNo">703</span> */<a name="line.703"></a>
-<span class="sourceLineNo">704</span>  public static long convertByteArrayToLong (byte [] numberAsByteArray) {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    if (numberAsByteArray == null) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span>      throw new IllegalArgumentException("convertByteArrayToLong called with a null array");<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    }<a name="line.707"></a>
-<span class="sourceLineNo">708</span><a name="line.708"></a>
-<span class="sourceLineNo">709</span>    int i = 0;<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    long result = 0;<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    boolean isNegative = false;<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span>    if (numberAsByteArray[i] == ParseConstants.MINUS_SIGN) {<a name="line.713"></a>
-<span class="sourceLineNo">714</span>      i++;<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      isNegative = true;<a name="line.715"></a>
-<span class="sourceLineNo">716</span>    }<a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span>    while (i != numberAsByteArray.length) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      if (numberAsByteArray[i] &lt; ParseConstants.ZERO ||<a name="line.719"></a>
-<span class="sourceLineNo">720</span>          numberAsByteArray[i] &gt; ParseConstants.NINE) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span>        throw new IllegalArgumentException("Byte Array should only contain digits");<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      }<a name="line.722"></a>
-<span class="sourceLineNo">723</span>      result = result*10 + (numberAsByteArray[i] - ParseConstants.ZERO);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>      if (result &lt; 0) {<a name="line.724"></a>
-<span class="sourceLineNo">725</span>        throw new IllegalArgumentException("Long Argument too large");<a name="line.725"></a>
-<span class="sourceLineNo">726</span>      }<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      i++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span>    if (isNegative) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span>      return -result;<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    } else {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      return result;<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    }<a name="line.734"></a>
-<span class="sourceLineNo">735</span>  }<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span>/**<a name="line.737"></a>
-<span class="sourceLineNo">738</span> * Converts a boolean expressed in a byte array to an actual boolean<a name="line.738"></a>
-<span class="sourceLineNo">739</span> *&lt;p&gt;<a name="line.739"></a>
-<span class="sourceLineNo">740</span> * This doesn't used Bytes.toBoolean because Bytes.toBoolean(byte [])<a name="line.740"></a>
-<span class="sourceLineNo">741</span> * assumes that 1 stands for true and 0 for false.<a name="line.741"></a>
-<span class="sourceLineNo">742</span> * Here, the byte array representing "true" and "false" is parsed<a name="line.742"></a>
-<span class="sourceLineNo">743</span> * &lt;p&gt;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> * @param booleanAsByteArray the boolean value expressed as a byte array<a name="line.744"></a>
-<span class="sourceLineNo">745</span> * @return the boolean value<a name="line.745"></a>
-<span class="sourceLineNo">746</span> */<a name="line.746"></a>
-<span class="sourceLineNo">747</span>  public static boolean convertByteArrayToBoolean (byte [] booleanAsByteArray) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    if (booleanAsByteArray == null) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span>      throw new IllegalArgumentException("convertByteArrayToBoolean called with a null array");<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    }<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span>    if (booleanAsByteArray.length == 4 &amp;&amp;<a name="line.752"></a>
-<span class="sourceLineNo">753</span>        (booleanAsByteArray[0] == 't' || booleanAsByteArray[0] == 'T') &amp;&amp;<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        (booleanAsByteArray[1] == 'r' || booleanAsByteArray[1] == 'R') &amp;&amp;<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        (booleanAsByteArray[2] == 'u' || booleanAsByteArray[2] == 'U') &amp;&amp;<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        (booleanAsByteArray[3] == 'e' || booleanAsByteArray[3] == 'E')) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>      return true;<a name="line.757"></a>
-<span class="sourceLineNo">758</span>    }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>    else if (booleanAsByteArray.length == 5 &amp;&amp;<a name="line.759"></a>
-<span class="sourceLineNo">760</span>             (booleanAsByteArray[0] == 'f' || booleanAsByteArray[0] == 'F') &amp;&amp;<a name="line.760"></a>
-<span class="sourceLineNo">761</span>             (booleanAsByteArray[1] == 'a' || booleanAsByteArray[1] == 'A') &amp;&amp;<a name="line.761"></a>
-<span class="sourceLineNo">762</span>             (booleanAsByteArray[2] == 'l' || booleanAsByteArray[2] == 'L') &amp;&amp;<a name="line.762"></a>
-<span class="sourceLineNo">763</span>             (booleanAsByteArray[3] == 's' || booleanAsByteArray[3] == 'S') &amp;&amp;<a name="line.763"></a>
-<span class="sourceLineNo">764</span>             (booleanAsByteArray[4] == 'e' || booleanAsByteArray[4] == 'E')) {<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      return false;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    else {<a name="line.767"></a>
-<span class="sourceLineNo">768</span>      throw new IllegalArgumentException("Incorrect Boolean Expression");<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    }<a name="line.769"></a>
-<span class="sourceLineNo">770</span>  }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>  /**<a name="line.772"></a>
-<span class="sourceLineNo">773</span>   * Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator<a name="line.773"></a>
-<span class="sourceLineNo">774</span>   * @param compareOpAsByteArray the comparatorOperator symbol as a byte array<a name="line.774"></a>
-<span class="sourceLineNo">775</span>   * @return the Compare Operator<a name="line.775"></a>
-<span class="sourceLineNo">776</span>   */<a name="line.776"></a>
-<span class="sourceLineNo">777</span>  public static CompareOperator createCompareOperator (byte [] compareOpAsByteArray) {<a name="line.777"></a>
-<span class="sourceLineNo">778</span>    ByteBuffer compareOp = ByteBuffer.wrap(compareOpAsByteArray);<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    if (compareOp.equals(ParseConstants.LESS_THAN_BUFFER))<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      return CompareOperator.LESS;<a name="line.780"></a>
-<span class="sourceLineNo">781</span>    else if (compareOp.equals(ParseConstants.LESS_THAN_OR_EQUAL_TO_BUFFER))<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      return CompareOperator.LESS_OR_EQUAL;<a name="line.782"></a>
-<span class="sourceLineNo">783</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_BUFFER))<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      return CompareOperator.GREATER;<a name="line.784"></a>
-<span class="sourceLineNo">785</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_OR_EQUAL_TO_BUFFER))<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      return CompareOperator.GREATER_OR_EQUAL;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    else if (compareOp.equals(ParseConstants.NOT_EQUAL_TO_BUFFER))<a name="line.787"></a>
-<span class="sourceLineNo">788</span>      return CompareOperator.NOT_EQUAL;<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    else if (compareOp.equals(ParseConstants.EQUAL_TO_BUFFER))<a name="line.789"></a>
-<span class="sourceLineNo">790</span>      return CompareOperator.EQUAL;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    else<a name="line.791"></a>
-<span class="sourceLineNo">792</span>      throw new IllegalArgumentException("Invalid compare operator");<a name="line.792"></a>
-<span class="sourceLineNo">793</span>  }<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>  /**<a name="line.795"></a>
-<span class="sourceLineNo">796</span>   * Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator<a name="line.796"></a>
-<span class="sourceLineNo">797</span>   * @deprecated Since 2.0<a name="line.797"></a>
-<span class="sourceLineNo">798</span>   * &lt;p&gt;<a name="line.798"></a>
-<span class="sourceLineNo">799</span>   * @param compareOpAsByteArray the comparatorOperator symbol as a byte array<a name="line.799"></a>
-<span class="sourceLineNo">800</span>   * @return the Compare Operator<a name="line.800"></a>
-<span class="sourceLineNo">801</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use {@link #createCompareOperator(byte [])}<a name="line.801"></a>
-<span class="sourceLineNo">802</span>   */<a name="line.802"></a>
-<span class="sourceLineNo">803</span>  @Deprecated<a name="line.803"></a>
-<span class="sourceLineNo">804</span>  public static CompareFilter.CompareOp createCompareOp (byte [] compareOpAsByteArray) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    ByteBuffer compareOp = ByteBuffer.wrap(compareOpAsByteArray);<a name="line.805"></a>
-<span class="sourceLineNo">806</span>    if (compareOp.equals(ParseConstants.LESS_THAN_BUFFER))<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return CompareOp.LESS;<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    else if (compareOp.equals(ParseConstants.LESS_THAN_OR_EQUAL_TO_BUFFER))<a name="line.808"></a>
-<span class="sourceLineNo">809</span>      return CompareOp.LESS_OR_EQUAL;<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_BUFFER))<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      return CompareOp.GREATER;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_OR_EQUAL_TO_BUFFER))<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      return CompareOp.GREATER_OR_EQUAL;<a name="line.813"></a>
-<span class="sourceLineNo">814</span>    else if (compareOp.equals(ParseConstants.NOT_EQUAL_TO_BUFFER))<a name="line.814"></a>
-<span class="sourceLineNo">815</span>      return CompareOp.NOT_EQUAL;<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    else if (compareOp.equals(ParseConstants.EQUAL_TO_BUFFER))<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return CompareOp.EQUAL;<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    else<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      throw new IllegalArgumentException("Invalid compare operator");<a name="line.819"></a>
-<span class="sourceLineNo">820</span>  }<a name="line.820"></a>
-<span class="sourceLineNo">821</span><a name="line.821"></a>
-<span class="sourceLineNo">822</span>/**<a name="line.822"></a>
-<span class="sourceLineNo">823</span> * Parses a comparator of the form comparatorType:comparatorValue form and returns a comparator<a name="line.823"></a>
-<span class="sourceLineNo">824</span> * &lt;p&gt;<a name="line.824"></a>
-<span class="sourceLineNo">825</span> * @param comparator the comparator in the form comparatorType:comparatorValue<a name="line.825"></a>
-<span class="sourceLineNo">826</span> * @return the parsed comparator<a name="line.826"></a>
-<span class="sourceLineNo">827</span> */<a name="line.827"></a>
-<span class="sourceLineNo">828</span>  public static ByteArrayComparable createComparator (byte [] comparator) {<a name="line.828"></a>
-<span class="sourceLineNo">829</span>    if (comparator == null)<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      throw new IllegalArgumentException("Incorrect Comparator");<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    byte [][] parsedComparator = ParseFilter.parseComparator(comparator);<a name="line.831"></a>
-<span class="sourceLineNo">832</span>    byte [] comparatorType = parsedComparator[0];<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    byte [] comparatorValue = parsedComparator[1];<a name="line.833"></a>
-<span class="sourceLineNo">834</span><a name="line.834"></a>
+<span class="sourceLineNo">251</span>    filterName = filterHashMap.get(filterName);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    final String methodName = "createFilterFromArguments";<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    try {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      Class&lt;?&gt; c = Class.forName(filterName);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      Class&lt;?&gt;[] argTypes = new Class[] { ArrayList.class };<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      Method m = c.getDeclaredMethod(methodName, argTypes);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      return (Filter) m.invoke(null, filterArguments);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    } catch (ClassNotFoundException e) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      LOG.error("Could not find class {}", filterName, e);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    } catch (NoSuchMethodException e) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      LOG.error("Could not find method {} in {}", methodName, filterName, e);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    } catch (IllegalAccessException e) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      LOG.error("Unable to access specified class {}", filterName, e);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } catch (InvocationTargetException e) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      LOG.error("Method {} threw an exception for {}", methodName, filterName, e);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    throw new IllegalArgumentException(<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        "Incorrect filter string " + new String(filterStringAsByteArray, StandardCharsets.UTF_8));<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>/**<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * Returns the filter name given a simple filter expression<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * &lt;p&gt;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * @param filterStringAsByteArray a simple filter expression<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @return name of filter in the simple filter expression<a name="line.275"></a>
+<span class="sourceLineNo">276</span> */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public static byte [] getFilterName (byte [] filterStringAsByteArray) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    int filterNameStartIndex = 0;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    int filterNameEndIndex = 0;<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>    for (int i=filterNameStartIndex; i&lt;filterStringAsByteArray.length; i++) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      if (filterStringAsByteArray[i] == ParseConstants.LPAREN ||<a name="line.282"></a>
+<span class="sourceLineNo">283</span>          filterStringAsByteArray[i] == ParseConstants.WHITESPACE) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        filterNameEndIndex = i;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        break;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<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>    if (filterNameEndIndex == 0) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      throw new IllegalArgumentException("Incorrect Filter Name");<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>    byte [] filterName = new byte[filterNameEndIndex - filterNameStartIndex];<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    Bytes.putBytes(filterName, 0, filterStringAsByteArray, 0,<a name="line.294"></a>
+<span class="sourceLineNo">295</span>                   filterNameEndIndex - filterNameStartIndex);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    return filterName;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>/**<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * Returns the arguments of the filter from the filter string<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * &lt;p&gt;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * @param filterStringAsByteArray filter string given by the user<a name="line.302"></a>
+<span class="sourceLineNo">303</span> * @return an ArrayList containing the arguments of the filter in the filter string<a name="line.303"></a>
+<span class="sourceLineNo">304</span> */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static ArrayList&lt;byte []&gt; getFilterArguments (byte [] filterStringAsByteArray) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    int argumentListStartIndex = Bytes.searchDelimiterIndex(filterStringAsByteArray, 0,<a name="line.306"></a>
+<span class="sourceLineNo">307</span>                                                       filterStringAsByteArray.length,<a name="line.307"></a>
+<span class="sourceLineNo">308</span>                                                       ParseConstants.LPAREN);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    if (argumentListStartIndex == -1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      throw new IllegalArgumentException("Incorrect argument list");<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>    int argumentStartIndex = 0;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    int argumentEndIndex = 0;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    ArrayList&lt;byte []&gt; filterArguments = new ArrayList&lt;&gt;();<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    for (int i = argumentListStartIndex + 1; i&lt;filterStringAsByteArray.length; i++) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>      if (filterStringAsByteArray[i] == ParseConstants.WHITESPACE ||<a name="line.319"></a>
+<span class="sourceLineNo">320</span>          filterStringAsByteArray[i] == ParseConstants.COMMA ||<a name="line.320"></a>
+<span class="sourceLineNo">321</span>          filterStringAsByteArray[i] == ParseConstants.RPAREN) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        continue;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>      // The argument is in single quotes - for example 'prefix'<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        argumentStartIndex = i;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        for (int j = argumentStartIndex+1; j &lt; filterStringAsByteArray.length; j++) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>          if (filterStringAsByteArray[j] == ParseConstants.SINGLE_QUOTE) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            if (isQuoteUnescaped(filterStringAsByteArray,j)) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>              argumentEndIndex = j;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>              i = j+1;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>              byte [] filterArgument = createUnescapdArgument(filterStringAsByteArray,<a name="line.333"></a>
+<span class="sourceLineNo">334</span>                                                              argumentStartIndex, argumentEndIndex);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>              filterArguments.add(filterArgument);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>              break;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>            } else {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>              // To jump over the second escaped quote<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              j++;<a name="line.339"></a>
+<span class="sourceLineNo">340</span>            }<a name="line.340"></a>
+<span class="sourceLineNo">341</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>            throw new IllegalArgumentException("Incorrect argument list");<a name="line.342"></a>
+<span class="sourceLineNo">343</span>          }<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      } else {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        // The argument is an integer, boolean, comparison operator like &lt;, &gt;, != etc<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        argumentStartIndex = i;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        for (int j = argumentStartIndex; j &lt; filterStringAsByteArray.length; j++) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>          if (filterStringAsByteArray[j] == ParseConstants.WHITESPACE ||<a name="line.349"></a>
+<span class="sourceLineNo">350</span>              filterStringAsByteArray[j] == ParseConstants.COMMA ||<a name="line.350"></a>
+<span class="sourceLineNo">351</span>              filterStringAsByteArray[j] == ParseConstants.RPAREN) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>            argumentEndIndex = j - 1;<a name="line.352"></a>
+<span class="sourceLineNo">353</span>            i = j;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>            byte [] filterArgument = new byte [argumentEndIndex - argumentStartIndex + 1];<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            Bytes.putBytes(filterArgument, 0, filterStringAsByteArray,<a name="line.355"></a>
+<span class="sourceLineNo">356</span>                           argumentStartIndex, argumentEndIndex - argumentStartIndex + 1);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            filterArguments.add(filterArgument);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>            break;<a name="line.358"></a>
+<span class="sourceLineNo">359</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            throw new IllegalArgumentException("Incorrect argument list");<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>      }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    return filterArguments;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>/**<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * This function is called while parsing the filterString and an operator is parsed<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * &lt;p&gt;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * @param operatorStack the stack containing the operators and parenthesis<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * @param filterStack the stack containing the filters<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * @param operator the operator found while parsing the filterString<a name="line.373"></a>
+<span class="sourceLineNo">374</span> */<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  public void reduce(Stack&lt;ByteBuffer&gt; operatorStack,<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                     Stack&lt;Filter&gt; filterStack,<a name="line.376"></a>
+<span class="sourceLineNo">377</span>                     ByteBuffer operator) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    while (!operatorStack.empty() &amp;&amp;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>           !(ParseConstants.LPAREN_BUFFER.equals(operatorStack.peek())) &amp;&amp;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>           hasHigherPriority(operatorStack.peek(), operator)) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      filterStack.push(popArguments(operatorStack, filterStack));<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><a name="line.384"></a>
+<span class="sourceLineNo">385</span>  /**<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   * Pops an argument from the operator stack and the number of arguments required by the operator<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * from the filterStack and evaluates them<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * &lt;p&gt;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @param operatorStack the stack containing the operators<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @param filterStack the stack containing the filters<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @return the evaluated filter<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  public static Filter popArguments (Stack&lt;ByteBuffer&gt; operatorStack, Stack &lt;Filter&gt; filterStack) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    ByteBuffer argumentOnTopOfStack = operatorStack.peek();<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>    if (argumentOnTopOfStack.equals(ParseConstants.OR_BUFFER)) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // The top of the stack is an OR<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      try {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.OR_BUFFER)) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          Filter filter = filterStack.pop();<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          listOfFilters.add(0, filter);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>          operatorStack.pop();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        Filter filter = filterStack.pop();<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        listOfFilters.add(0, filter);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        Filter orFilter = new FilterList(FilterList.Operator.MUST_PASS_ONE, listOfFilters);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        return orFilter;<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      } catch (EmptyStackException e) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        throw new IllegalArgumentException("Incorrect input string - an OR needs two filters");<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>    } else if (argumentOnTopOfStack.equals(ParseConstants.AND_BUFFER)) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      // The top of the stack is an AND<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      try {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.AND_BUFFER)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          Filter filter = filterStack.pop();<a name="line.418"></a>
+<span class="sourceLineNo">419</span>          listOfFilters.add(0, filter);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          operatorStack.pop();<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        }<a name="line.421"></a>
+<span class="sourceLineNo">422</span>        Filter filter = filterStack.pop();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        listOfFilters.add(0, filter);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>        Filter andFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL, listOfFilters);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        return andFilter;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      } catch (EmptyStackException e) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        throw new IllegalArgumentException("Incorrect input string - an AND needs two filters");<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.SKIP_BUFFER)) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      // The top of the stack is a SKIP<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      try {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        Filter wrappedFilter = filterStack.pop();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        Filter skipFilter = new SkipFilter(wrappedFilter);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        operatorStack.pop();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>        return skipFilter;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      } catch (EmptyStackException e) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>        throw new IllegalArgumentException("Incorrect input string - a SKIP wraps a filter");<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.WHILE_BUFFER)) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      // The top of the stack is a WHILE<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      try {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        Filter wrappedFilter = filterStack.pop();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>        Filter whileMatchFilter = new WhileMatchFilter(wrappedFilter);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        operatorStack.pop();<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        return whileMatchFilter;<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      } catch (EmptyStackException e) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        throw new IllegalArgumentException("Incorrect input string - a WHILE wraps a filter");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.LPAREN_BUFFER)) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      // The top of the stack is a LPAREN<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      try {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        Filter filter  = filterStack.pop();<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        operatorStack.pop();<a name="line.456"></a>
+<span class="sourceLineNo">457</span>        return filter;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      } catch (EmptyStackException e) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>        throw new IllegalArgumentException("Incorrect Filter String");<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      }<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span>    } else {<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      throw new IllegalArgumentException("Incorrect arguments on operatorStack");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>  }<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>/**<a name="line.467"></a>
+<span class="sourceLineNo">468</span> * Returns which operator has higher precedence<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * &lt;p&gt;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * If a has higher precedence than b, it returns true<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * If they have the same precedence, it returns false<a name="line.471"></a>
+<span class="sourceLineNo">472</span> */<a name="line.472"></a>
+<span class="sourceLineNo">473</span>  public boolean hasHigherPriority(ByteBuffer a, ByteBuffer b) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    if ((operatorPrecedenceHashMap.get(a) - operatorPrecedenceHashMap.get(b)) &lt; 0) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      return true;<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    }<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    return false;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span>/**<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * Removes the single quote escaping a single quote - thus it returns an unescaped argument<a name="line.481"></a>
+<span class="sourceLineNo">482</span> * &lt;p&gt;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> * @param filterStringAsByteArray filter string given by user<a name="line.483"></a>
+<span class="sourceLineNo">484</span> * @param argumentStartIndex start index of the argument<a name="line.484"></a>
+<span class="sourceLineNo">485</span> * @param argumentEndIndex end index of the argument<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return returns an unescaped argument<a name="line.486"></a>
+<span class="sourceLineNo">487</span> */<a name="line.487"></a>
+<span class="sourceLineNo">488</span>  public static byte [] createUnescapdArgument (byte [] filterStringAsByteArray,<a name="line.488"></a>
+<span class="sourceLineNo">489</span>                                                int argumentStartIndex, int argumentEndIndex) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    int unescapedArgumentLength = 2;<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>      unescapedArgumentLength ++;<a name="line.492"></a>
+<span class="sourceLineNo">493</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.493"></a>
+<span class="sourceLineNo">494</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.494"></a>
+<span class="sourceLineNo">495</span>          filterStringAsByteArray[i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span>        i++;<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        continue;<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span>    byte [] unescapedArgument = new byte [unescapedArgumentLength];<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    int count = 1;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    unescapedArgument[0] = '\'';<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      if (filterStringAsByteArray [i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.506"></a>
+<span class="sourceLineNo">507</span>          filterStringAsByteArray [i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>        unescapedArgument[count++] = filterStringAsByteArray [i+1];<a name="line.508"></a>
+<span class="sourceLineNo">509</span>        i++;<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      }<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      else {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        unescapedArgument[count++] = filterStringAsByteArray [i];<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    }<a name="line.514"></a>
+<span class="sourceLineNo">515</span>    unescapedArgument[unescapedArgumentLength - 1] = '\'';<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    return unescapedArgument;<a name="line.516"></a>
+<span class="sourceLineNo">517</span>  }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>/**<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'OR'<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * &lt;p&gt;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * @param filterStringAsByteArray filter string given by the user<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * @param indexOfOr index at which an 'O' was read<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return true if the keyword 'OR' is at the current index<a name="line.524"></a>
+<span class="sourceLineNo">525</span> */<a name="line.525"></a>
+<span class="sourceLineNo">526</span>  public static boolean checkForOr (byte [] filterStringAsByteArray, int indexOfOr)<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    throws CharacterCodingException, ArrayIndexOutOfBoundsException {<a name="line.527"></a>
+<span class=

<TRUNCATED>

[27/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparablePartitioner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparablePartitioner.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparablePartitioner.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparablePartitioner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparablePartitioner.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></

<TRUNCATED>

[04/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
index 0b475e4..6b1d637 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
@@ -52,126 +52,130 @@
 <span class="sourceLineNo">044</span>import org.apache.zookeeper.server.ZooKeeperServerMain;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import org.apache.zookeeper.server.quorum.QuorumPeerConfig;<a name="line.45"></a>
 <span class="sourceLineNo">046</span>import org.apache.zookeeper.server.quorum.QuorumPeerMain;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * HBase's version of ZooKeeper's QuorumPeer. When HBase is set to manage<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * ZooKeeper, this class is used to start up QuorumPeer instances. By doing<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * things in here rather than directly calling to ZooKeeper, we have more<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * control over the process. This class uses {@link ZKConfig} to get settings<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * from the hbase-site.xml file.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.55"></a>
-<span class="sourceLineNo">056</span>@InterfaceStability.Evolving<a name="line.56"></a>
-<span class="sourceLineNo">057</span>public final class HQuorumPeer {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private HQuorumPeer() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * Parse ZooKeeper configuration from HBase XML config and run a QuorumPeer.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * @param args String[] of command line arguments. Not used.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static void main(String[] args) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    Configuration conf = HBaseConfiguration.create();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    try {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      Properties zkProperties = ZKConfig.makeZKProps(conf);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      writeMyID(zkProperties);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      QuorumPeerConfig zkConfig = new QuorumPeerConfig();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      zkConfig.parseProperties(zkProperties);<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>      // login the zookeeper server principal (if using security)<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      ZKUtil.loginServer(conf, HConstants.ZK_SERVER_KEYTAB_FILE,<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        HConstants.ZK_SERVER_KERBEROS_PRINCIPAL,<a name="line.75"></a>
-<span class="sourceLineNo">076</span>        zkConfig.getClientPortAddress().getHostName());<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>      runZKServer(zkConfig);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    } catch (Exception e) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      e.printStackTrace();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      System.exit(-1);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  private static void runZKServer(QuorumPeerConfig zkConfig)<a name="line.85"></a>
-<span class="sourceLineNo">086</span>          throws UnknownHostException, IOException {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    if (zkConfig.isDistributed()) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      QuorumPeerMain qp = new QuorumPeerMain();<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      qp.runFromConfig(zkConfig);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    } else {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      ZooKeeperServerMain zk = new ZooKeeperServerMain();<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      ServerConfig serverConfig = new ServerConfig();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      serverConfig.readFrom(zkConfig);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      zk.runFromConfig(serverConfig);<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>  private static boolean addressIsLocalHost(String address) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    return address.equals("localhost") || address.equals("127.0.0.1");<a name="line.99"></a>
+<span class="sourceLineNo">047</span>import org.slf4j.Logger;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.LoggerFactory;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * HBase's version of ZooKeeper's QuorumPeer. When HBase is set to manage<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * ZooKeeper, this class is used to start up QuorumPeer instances. By doing<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * things in here rather than directly calling to ZooKeeper, we have more<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * control over the process. This class uses {@link ZKConfig} to get settings<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * from the hbase-site.xml file.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.57"></a>
+<span class="sourceLineNo">058</span>@InterfaceStability.Evolving<a name="line.58"></a>
+<span class="sourceLineNo">059</span>public final class HQuorumPeer {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private static final Logger LOG = LoggerFactory.getLogger(HQuorumPeer.class);<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>  private HQuorumPeer() {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Parse ZooKeeper configuration from HBase XML config and run a QuorumPeer.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param args String[] of command line arguments. Not used.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public static void main(String[] args) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    Configuration conf = HBaseConfiguration.create();<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    try {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      Properties zkProperties = ZKConfig.makeZKProps(conf);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      writeMyID(zkProperties);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      QuorumPeerConfig zkConfig = new QuorumPeerConfig();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      zkConfig.parseProperties(zkProperties);<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>      // login the zookeeper server principal (if using security)<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      ZKUtil.loginServer(conf, HConstants.ZK_SERVER_KEYTAB_FILE,<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        HConstants.ZK_SERVER_KERBEROS_PRINCIPAL,<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        zkConfig.getClientPortAddress().getHostName());<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>      runZKServer(zkConfig);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    } catch (Exception e) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      LOG.error("Failed to start ZKServer", e);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      System.exit(-1);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    }<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>  private static void runZKServer(QuorumPeerConfig zkConfig)<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          throws UnknownHostException, IOException {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    if (zkConfig.isDistributed()) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      QuorumPeerMain qp = new QuorumPeerMain();<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      qp.runFromConfig(zkConfig);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    } else {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      ZooKeeperServerMain zk = new ZooKeeperServerMain();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      ServerConfig serverConfig = new ServerConfig();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      serverConfig.readFrom(zkConfig);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      zk.runFromConfig(serverConfig);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    }<a name="line.99"></a>
 <span class="sourceLineNo">100</span>  }<a name="line.100"></a>
 <span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>  static void writeMyID(Properties properties) throws IOException {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    long myId = -1;<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>    Configuration conf = HBaseConfiguration.create();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    String myAddress = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        conf.get("hbase.zookeeper.dns.interface","default"),<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        conf.get("hbase.zookeeper.dns.nameserver","default")));<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>    List&lt;String&gt; ips = new ArrayList&lt;&gt;();<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>    // Add what could be the best (configured) match<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    ips.add(myAddress.contains(".") ?<a name="line.113"></a>
-<span class="sourceLineNo">114</span>        myAddress :<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        StringUtils.simpleHostname(myAddress));<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    // For all nics get all hostnames and IPs<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    Enumeration&lt;?&gt; nics = NetworkInterface.getNetworkInterfaces();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    while(nics.hasMoreElements()) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      Enumeration&lt;?&gt; rawAdrs =<a name="line.120"></a>
-<span class="sourceLineNo">121</span>          ((NetworkInterface)nics.nextElement()).getInetAddresses();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      while(rawAdrs.hasMoreElements()) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        InetAddress inet = (InetAddress) rawAdrs.nextElement();<a name="line.123"></a>
-<span class="sourceLineNo">124</span>        ips.add(StringUtils.simpleHostname(inet.getHostName()));<a name="line.124"></a>
-<span class="sourceLineNo">125</span>        ips.add(inet.getHostAddress());<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    for (Entry&lt;Object, Object&gt; entry : properties.entrySet()) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      String key = entry.getKey().toString().trim();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      String value = entry.getValue().toString().trim();<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      if (key.startsWith("server.")) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        int dot = key.indexOf('.');<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        long id = Long.parseLong(key.substring(dot + 1));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        String[] parts = value.split(":");<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        String address = parts[0];<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        if (addressIsLocalHost(address) || ips.contains(address)) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>          myId = id;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>          break;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>    // Set the max session timeout from the provided client-side timeout<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    properties.setProperty("maxSessionTimeout", conf.get(HConstants.ZK_SESSION_TIMEOUT,<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            Integer.toString(HConstants.DEFAULT_ZK_SESSION_TIMEOUT)));<a name="line.146"></a>
+<span class="sourceLineNo">102</span>  private static boolean addressIsLocalHost(String address) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    return address.equals("localhost") || address.equals("127.0.0.1");<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  static void writeMyID(Properties properties) throws IOException {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    long myId = -1;<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>    Configuration conf = HBaseConfiguration.create();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    String myAddress = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.110"></a>
+<span class="sourceLineNo">111</span>        conf.get("hbase.zookeeper.dns.interface","default"),<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        conf.get("hbase.zookeeper.dns.nameserver","default")));<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>    List&lt;String&gt; ips = new ArrayList&lt;&gt;();<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>    // Add what could be the best (configured) match<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    ips.add(myAddress.contains(".") ?<a name="line.117"></a>
+<span class="sourceLineNo">118</span>        myAddress :<a name="line.118"></a>
+<span class="sourceLineNo">119</span>        StringUtils.simpleHostname(myAddress));<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>    // For all nics get all hostnames and IPs<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    Enumeration&lt;?&gt; nics = NetworkInterface.getNetworkInterfaces();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    while(nics.hasMoreElements()) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      Enumeration&lt;?&gt; rawAdrs =<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          ((NetworkInterface)nics.nextElement()).getInetAddresses();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      while(rawAdrs.hasMoreElements()) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        InetAddress inet = (InetAddress) rawAdrs.nextElement();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        ips.add(StringUtils.simpleHostname(inet.getHostName()));<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        ips.add(inet.getHostAddress());<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>    for (Entry&lt;Object, Object&gt; entry : properties.entrySet()) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      String key = entry.getKey().toString().trim();<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      String value = entry.getValue().toString().trim();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      if (key.startsWith("server.")) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        int dot = key.indexOf('.');<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        long id = Long.parseLong(key.substring(dot + 1));<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        String[] parts = value.split(":");<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        String address = parts[0];<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        if (addressIsLocalHost(address) || ips.contains(address)) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>          myId = id;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>          break;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        }<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
 <span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    if (myId == -1) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      throw new IOException("Could not find my address: " + myAddress +<a name="line.149"></a>
-<span class="sourceLineNo">150</span>                            " in list of ZooKeeper quorum servers");<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>    String dataDirStr = properties.get("dataDir").toString().trim();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    File dataDir = new File(dataDirStr);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    if (!dataDir.isDirectory()) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      if (!dataDir.mkdirs()) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        throw new IOException("Unable to create data dir " + dataDir);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>    File myIdFile = new File(dataDir, "myid");<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    PrintWriter w = new PrintWriter(myIdFile, StandardCharsets.UTF_8.name());<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    w.println(myId);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    w.close();<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>}<a name="line.166"></a>
+<span class="sourceLineNo">148</span>    // Set the max session timeout from the provided client-side timeout<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    properties.setProperty("maxSessionTimeout", conf.get(HConstants.ZK_SESSION_TIMEOUT,<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            Integer.toString(HConstants.DEFAULT_ZK_SESSION_TIMEOUT)));<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>    if (myId == -1) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      throw new IOException("Could not find my address: " + myAddress +<a name="line.153"></a>
+<span class="sourceLineNo">154</span>                            " in list of ZooKeeper quorum servers");<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    String dataDirStr = properties.get("dataDir").toString().trim();<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    File dataDir = new File(dataDirStr);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (!dataDir.isDirectory()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      if (!dataDir.mkdirs()) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        throw new IOException("Unable to create data dir " + dataDir);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      }<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>    File myIdFile = new File(dataDir, "myid");<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    PrintWriter w = new PrintWriter(myIdFile, StandardCharsets.UTF_8.name());<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    w.println(myId);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    w.close();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>}<a name="line.170"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index 7fd1387..6666173 100644
--- a/downloads.html
+++ b/downloads.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase Downloads</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -423,7 +423,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 21864ba..1e74603 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Export Control
@@ -331,7 +331,7 @@ for more details.</p>
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 8391016..dc813ff 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBaseâ„¢ Home</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -411,7 +411,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index 55a7338..0f7f8f4 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; CI Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -291,7 +291,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 2e754f5..e74d072 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Issue Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -288,7 +288,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index 8b58bb3..8a4e662 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Licenses</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -491,7 +491,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index 19f02fc..9edb23f 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Mailing Lists</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -341,7 +341,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index 40e2e0a..dbe8eb4 100644
--- a/metrics.html
+++ b/metrics.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) Metrics
@@ -459,7 +459,7 @@ export HBASE_REGIONSERVER_OPTS=&quot;$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index cf4755d..1d92dd6 100644
--- a/old_news.html
+++ b/old_news.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Old Apache HBase (TM) News
@@ -440,7 +440,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index 04773f3..dfbc508 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Plugin Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -440,7 +440,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 80134f9..01068eb 100644
--- a/plugins.html
+++ b/plugins.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Plugins</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -375,7 +375,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index cf598eb..73b9228 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Powered By Apache HBase™</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -769,7 +769,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index 9fd86f3..943106c 100644
--- a/project-info.html
+++ b/project-info.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -335,7 +335,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index d093b22..0377ca5 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Generated Reports</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -305,7 +305,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index 6ef4813..8ddcf9d 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Summary</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -331,7 +331,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index a4c9404..4acfe77 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
 Running Apache HBase (TM) in pseudo-distributed mode
@@ -308,7 +308,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index c543369..773b2f6 100644
--- a/replication.html
+++ b/replication.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Apache HBase (TM) Replication
@@ -303,7 +303,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index a8e64f6..ded7bf5 100644
--- a/resources.html
+++ b/resources.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Other Apache HBase (TM) Resources</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -331,7 +331,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index d2cf3d5..dcc2b49 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Source Code Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -299,7 +299,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index 26b5221..744b311 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase™ Sponsors</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -333,7 +333,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 13d2f7d..9aabfa6 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Supporting Projects</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -520,7 +520,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 039982f..ad7f29d 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Team</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -748,7 +748,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 1bbc8ca..5f10778 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -65204,6 +65204,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/coprocessor/TestIncrementAndAppendWithNullResult.MyObserver.html#TMP_RESULT">TMP_RESULT</a></span> - Static variable in class org.apache.hadoop.hbase.coprocessor.<a href="org/apache/hadoop/hbase/coprocessor/TestIncrementAndAppendWithNullResult.MyObserver.html" title="class in org.apache.hadoop.hbase.coprocessor">TestIncrementAndAppendWithNullResult.MyObserver</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/TestWALSplit.html#TMPDIRNAME">TMPDIRNAME</a></span> - Variable in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/TestWALSplit.html" title="class in org.apache.hadoop.hbase.wal">TestWALSplit</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ipc/TestBufferChain.html#tmpFile">tmpFile</a></span> - Variable in class org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/TestBufferChain.html" title="class in org.apache.hadoop.hbase.ipc">TestBufferChain</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#tn">tn</a></span> - Variable 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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 ec56445..4837d80 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -158,8 +158,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TestCacheOnWrite.CacheOnWriteType</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="typeNameLink">TagUsage</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="typeNameLink">TestCacheOnWrite.CacheOnWriteType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 72d6388..5347145 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -576,15 +576,15 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</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="typeNameLink">RESTApiClusterManager.Service</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="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</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="typeNameLink">ResourceChecker.Phase</span></a></li>
-<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="typeNameLink">ScanPerformanceEvaluation.ScanCounter</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="typeNameLink">HBaseClusterManager.CommandProvider.Operation</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="typeNameLink">ClusterManager.ServiceType</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="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<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="typeNameLink">ScanPerformanceEvaluation.ScanCounter</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="typeNameLink">ResourceChecker.Phase</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="typeNameLink">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="typeNameLink">PerformanceEvaluation.Counter</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="typeNameLink">ClusterManager.ServiceType</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="typeNameLink">HBaseClusterManager.CommandProvider.Operation</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="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
index 28973e0..a1c9b1d 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
@@ -81,14 +81,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure&lt;TEnvironment&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;)
+<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
+<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure&lt;TEnvironment&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.procedure.ProcedureManager

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 7a3434e..8dfb8db 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -206,9 +206,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</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="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</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="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 b280f02..7f0419a 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -669,9 +669,9 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</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="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</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="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 1499365..929782e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">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="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</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="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.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="typeNameLink">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="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html b/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
index 86a8917..a25d559 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.150">TestWALSplit.Corruptions</a>
+<pre>static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.151">TestWALSplit.Corruptions</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>&gt;</pre>
 </li>
 </ul>
@@ -219,7 +219,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>INSERT_GARBAGE_ON_FIRST_LINE</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.151">INSERT_GARBAGE_ON_FIRST_LINE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.152">INSERT_GARBAGE_ON_FIRST_LINE</a></pre>
 </li>
 </ul>
 <a name="INSERT_GARBAGE_IN_THE_MIDDLE">
@@ -228,7 +228,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>INSERT_GARBAGE_IN_THE_MIDDLE</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.152">INSERT_GARBAGE_IN_THE_MIDDLE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.153">INSERT_GARBAGE_IN_THE_MIDDLE</a></pre>
 </li>
 </ul>
 <a name="APPEND_GARBAGE">
@@ -237,7 +237,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>APPEND_GARBAGE</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.153">APPEND_GARBAGE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.154">APPEND_GARBAGE</a></pre>
 </li>
 </ul>
 <a name="TRUNCATE">
@@ -246,7 +246,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>TRUNCATE</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.154">TRUNCATE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.155">TRUNCATE</a></pre>
 </li>
 </ul>
 <a name="TRUNCATE_TRAILER">
@@ -255,7 +255,7 @@ the order they are declared.</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TRUNCATE_TRAILER</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.155">TRUNCATE_TRAILER</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.156">TRUNCATE_TRAILER</a></pre>
 </li>
 </ul>
 </li>
@@ -272,7 +272,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.150">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.151">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -292,7 +292,7 @@ for (TestWALSplit.Corruptions c : TestWALSplit.Corruptions.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.150">valueOf</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal">TestWALSplit.Corruptions</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html#line.151">valueOf</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html b/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
index ca2b31c..2226c07 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.281">TestWALSplit.ZombieLastLogWriterRegionServer</a>
+<pre>class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html#line.284">TestWALSplit.ZombieLastLogWriterRegionServer</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a></pre>
 <div class="block">This thread will keep writing to a 'wal' file even after the split process has started.
  It simulates a region server that was considered dead but woke up and wrote some more to the
@@ -272,7 +272,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockList">
 <li class="blockList">
 <h4>editsCount</h4>
-<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.282">editsCount</a></pre>
+<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.285">editsCount</a></pre>
 </li>
 </ul>
 <a name="stop">
@@ -281,7 +281,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockList">
 <li class="blockList">
 <h4>stop</h4>
-<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.283">stop</a></pre>
+<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.286">stop</a></pre>
 </li>
 </ul>
 <a name="numOfWriters">
@@ -290,7 +290,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockList">
 <li class="blockList">
 <h4>numOfWriters</h4>
-<pre>final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.284">numOfWriters</a></pre>
+<pre>final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.287">numOfWriters</a></pre>
 </li>
 </ul>
 <a name="region">
@@ -299,7 +299,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockList">
 <li class="blockList">
 <h4>region</h4>
-<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.288">region</a></pre>
+<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.291">region</a></pre>
 <div class="block">Region to write edits for.</div>
 </li>
 </ul>
@@ -309,7 +309,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>user</h4>
-<pre>final&nbsp;org.apache.hadoop.hbase.security.User <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.289">user</a></pre>
+<pre>final&nbsp;org.apache.hadoop.hbase.security.User <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.292">user</a></pre>
 </li>
 </ul>
 </li>
@@ -326,7 +326,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ZombieLastLogWriterRegionServer</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.291">ZombieLastLogWriterRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a>&nbsp;counter,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.294">ZombieLastLogWriterRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a>&nbsp;counter,
                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a>&nbsp;stop,
                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;region,
                                        int&nbsp;writers)
@@ -353,7 +353,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.304">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.307">run</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
@@ -368,7 +368,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockList">
 <li class="blockList">
 <h4>doWriting</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.314">doWriting</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.317">doWriting</a>()
                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <dl>
@@ -384,7 +384,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>loop</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.345">loop</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;writer)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html#line.348">loop</a>(org.apache.hadoop.hbase.wal.WALProvider.Writer&nbsp;writer)</pre>
 </li>
 </ul>
 </li>


[28/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.appen

<TRUNCATED>

[48/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html b/apidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
index 3e3acbe..e2dc8f5 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
@@ -48,376 +48,379 @@
 <span class="sourceLineNo">040</span>import org.apache.hadoop.mapred.OutputFormat;<a name="line.40"></a>
 <span class="sourceLineNo">041</span>import org.apache.hadoop.mapred.TextInputFormat;<a name="line.41"></a>
 <span class="sourceLineNo">042</span>import org.apache.hadoop.mapred.TextOutputFormat;<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>import java.io.IOException;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import java.util.Collection;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import java.util.Map;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * Utility for {@link TableMap} and {@link TableReduce}<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>@InterfaceAudience.Public<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class TableMapReduceUtil {<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * Use this before submitting a TableMap job. It will<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * appropriately set up the JobConf.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   *<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   * @param table  The table name to read from.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   * @param columns  The columns to scan.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * @param mapper  The mapper class to use.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * @param outputKeyClass  The class of the output key.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * @param outputValueClass  The class of the output value.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @param job  The current job configuration to adjust.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static void initTableMapJob(String table, String columns,<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    Class&lt;?&gt; outputKeyClass,<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    Class&lt;?&gt; outputValueClass, JobConf job) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      true, TableInputFormat.class);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public static void initTableMapJob(String table, String columns,<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    Class&lt;?&gt; outputKeyClass,<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      addDependencyJars, TableInputFormat.class);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * Use this before submitting a TableMap job. It will<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   * appropriately set up the JobConf.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   *<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * @param table  The table name to read from.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @param columns  The columns to scan.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   * @param mapper  The mapper class to use.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @param outputKeyClass  The class of the output key.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   * @param outputValueClass  The class of the output value.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   * @param job  The current job configuration to adjust.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   *           job classes via the distributed cache (tmpjars).<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public static void initTableMapJob(String table, String columns,<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    Class&lt;?&gt; outputKeyClass,<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars,<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    Class&lt;? extends InputFormat&gt; inputFormat) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>    job.setInputFormat(inputFormat);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    job.setMapOutputValueClass(outputValueClass);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    job.setMapOutputKeyClass(outputKeyClass);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    job.setMapperClass(mapper);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    FileInputFormat.addInputPaths(job, table);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    job.set(TableInputFormat.COLUMN_LIST, columns);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    if (addDependencyJars) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      try {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        addDependencyJars(job);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      } catch (IOException e) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        e.printStackTrace();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    try {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      initCredentials(job);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    } catch (IOException ioe) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      // just spit out the stack trace?  really?<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      ioe.printStackTrace();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   * Sets up the job for reading from one or more multiple table snapshots, with one or more scans<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   * per snapshot.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   * It bypasses hbase servers and read directly from snapshot files.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   *<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   * @param snapshotScans     map of snapshot name to scans on that snapshot.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   * @param mapper            The mapper class to use.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   * @param outputKeyClass    The class of the output key.<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * @param outputValueClass  The class of the output value.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * @param job               The current job to adjust.  Make sure the passed job is<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   *                          carrying all necessary HBase configuration.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   *                          job classes via the distributed cache (tmpjars).<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public static void initMultiTableSnapshotMapperJob(Map&lt;String, Collection&lt;Scan&gt;&gt; snapshotScans,<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      Class&lt;? extends TableMap&gt; mapper, Class&lt;?&gt; outputKeyClass, Class&lt;?&gt; outputValueClass,<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      JobConf job, boolean addDependencyJars, Path tmpRestoreDir) throws IOException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    MultiTableSnapshotInputFormat.setInput(job, snapshotScans, tmpRestoreDir);<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>    job.setInputFormat(MultiTableSnapshotInputFormat.class);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    if (outputValueClass != null) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      job.setMapOutputValueClass(outputValueClass);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    if (outputKeyClass != null) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      job.setMapOutputKeyClass(outputKeyClass);<a name="line.148"></a>
+<span class="sourceLineNo">043</span>import org.slf4j.Logger;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.LoggerFactory;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>import java.io.IOException;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import java.util.Collection;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import java.util.Map;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Utility for {@link TableMap} and {@link TableReduce}<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@InterfaceAudience.Public<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class TableMapReduceUtil {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private static final Logger LOG = LoggerFactory.getLogger(TableMapReduceUtil.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * Use this before submitting a TableMap job. It will<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * appropriately set up the JobConf.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   *<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   * @param table  The table name to read from.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   * @param columns  The columns to scan.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   * @param mapper  The mapper class to use.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * @param outputKeyClass  The class of the output key.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * @param outputValueClass  The class of the output value.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param job  The current job configuration to adjust.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public static void initTableMapJob(String table, String columns,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    Class&lt;?&gt; outputKeyClass,<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    Class&lt;?&gt; outputValueClass, JobConf job) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      true, TableInputFormat.class);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  public static void initTableMapJob(String table, String columns,<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    Class&lt;?&gt; outputKeyClass,<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      addDependencyJars, TableInputFormat.class);<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>  /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * Use this before submitting a TableMap job. It will<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * appropriately set up the JobConf.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   *<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * @param table  The table name to read from.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * @param columns  The columns to scan.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * @param mapper  The mapper class to use.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @param outputKeyClass  The class of the output key.<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   * @param outputValueClass  The class of the output value.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * @param job  The current job configuration to adjust.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   *           job classes via the distributed cache (tmpjars).<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public static void initTableMapJob(String table, String columns,<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    Class&lt;?&gt; outputKeyClass,<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars,<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    Class&lt;? extends InputFormat&gt; inputFormat) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>    job.setInputFormat(inputFormat);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    job.setMapOutputValueClass(outputValueClass);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    job.setMapOutputKeyClass(outputKeyClass);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    job.setMapperClass(mapper);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    FileInputFormat.addInputPaths(job, table);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    job.set(TableInputFormat.COLUMN_LIST, columns);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (addDependencyJars) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      try {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        addDependencyJars(job);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      } catch (IOException e) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        LOG.error("IOException encountered while adding dependency jars", e);<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>    try {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      initCredentials(job);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    } catch (IOException ioe) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      // just spit out the stack trace?  really?<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      LOG.error("IOException encountered while initializing credentials", ioe);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * Sets up the job for reading from one or more multiple table snapshots, with one or more scans<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * per snapshot.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * It bypasses hbase servers and read directly from snapshot files.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   *<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @param snapshotScans     map of snapshot name to scans on that snapshot.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @param mapper            The mapper class to use.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   * @param outputKeyClass    The class of the output key.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * @param outputValueClass  The class of the output value.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   * @param job               The current job to adjust.  Make sure the passed job is<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   *                          carrying all necessary HBase configuration.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   *                          job classes via the distributed cache (tmpjars).<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public static void initMultiTableSnapshotMapperJob(Map&lt;String, Collection&lt;Scan&gt;&gt; snapshotScans,<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      Class&lt;? extends TableMap&gt; mapper, Class&lt;?&gt; outputKeyClass, Class&lt;?&gt; outputValueClass,<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      JobConf job, boolean addDependencyJars, Path tmpRestoreDir) throws IOException {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    MultiTableSnapshotInputFormat.setInput(job, snapshotScans, tmpRestoreDir);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    job.setInputFormat(MultiTableSnapshotInputFormat.class);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    if (outputValueClass != null) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      job.setMapOutputValueClass(outputValueClass);<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    job.setMapperClass(mapper);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    if (addDependencyJars) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      addDependencyJars(job);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  }<a name="line.156"></a>
+<span class="sourceLineNo">150</span>    if (outputKeyClass != null) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      job.setMapOutputKeyClass(outputKeyClass);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    job.setMapperClass(mapper);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    if (addDependencyJars) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      addDependencyJars(job);<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>  /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.159"></a>
-<span class="sourceLineNo">160</span>   * and read directly from snapshot files.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   *<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * @param columns  The columns to scan.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @param mapper  The mapper class to use.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * @param outputKeyClass  The class of the output key.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @param outputValueClass  The class of the output value.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * @param job  The current job to adjust.  Make sure the passed job is<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * carrying all necessary HBase configuration.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   *           job classes via the distributed cache (tmpjars).<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * After the job is finished, restore directory can be deleted.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   * @throws IOException When setting up the details fails.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   * @see TableSnapshotInputFormat<a name="line.175"></a>
-<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      Class&lt;? extends TableMap&gt; mapper,<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      Class&lt;?&gt; outputKeyClass,<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      Class&lt;?&gt; outputValueClass, JobConf job,<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      boolean addDependencyJars, Path tmpRestoreDir)<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  throws IOException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      addDependencyJars, TableSnapshotInputFormat.class);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>  /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   * and read directly from snapshot files.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   *<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * @param columns  The columns to scan.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * @param mapper  The mapper class to use.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * @param outputKeyClass  The class of the output key.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @param outputValueClass  The class of the output value.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @param jobConf  The current job to adjust.  Make sure the passed job is<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * carrying all necessary HBase configuration.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   *           job classes via the distributed cache (tmpjars).<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * After the job is finished, restore directory can be deleted.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @param splitAlgo algorithm to split<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @param numSplitsPerRegion how many input splits to generate per one region<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   * @throws IOException When setting up the details fails.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   * @see TableSnapshotInputFormat<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.210"></a>
-<span class="sourceLineNo">211</span>                                             Class&lt;? extends TableMap&gt; mapper,<a name="line.211"></a>
-<span class="sourceLineNo">212</span>                                             Class&lt;?&gt; outputKeyClass,<a name="line.212"></a>
-<span class="sourceLineNo">213</span>                                             Class&lt;?&gt; outputValueClass, JobConf jobConf,<a name="line.213"></a>
-<span class="sourceLineNo">214</span>                                             boolean addDependencyJars, Path tmpRestoreDir,<a name="line.214"></a>
-<span class="sourceLineNo">215</span>                                             RegionSplitter.SplitAlgorithm splitAlgo,<a name="line.215"></a>
-<span class="sourceLineNo">216</span>                                             int numSplitsPerRegion)<a name="line.216"></a>
-<span class="sourceLineNo">217</span>          throws IOException {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    TableSnapshotInputFormat.setInput(jobConf, snapshotName, tmpRestoreDir, splitAlgo,<a name="line.218"></a>
-<span class="sourceLineNo">219</span>            numSplitsPerRegion);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, jobConf,<a name="line.220"></a>
-<span class="sourceLineNo">221</span>            addDependencyJars, TableSnapshotInputFormat.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(jobConf);<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><a name="line.225"></a>
-<span class="sourceLineNo">226</span>  /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   * Use this before submitting a TableReduce job. It will<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   * appropriately set up the JobConf.<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   *<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * @param table  The output table.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   * @param reducer  The reducer class to use.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @param job  The current job configuration to adjust.<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @throws IOException When determining the region count fails.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  public static void initTableReduceJob(String table,<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job)<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    initTableReduceJob(table, reducer, job, null);<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>  /**<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * Use this before submitting a TableReduce job. It will<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * appropriately set up the JobConf.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   *<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param table  The output table.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   * @param reducer  The reducer class to use.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   * @param job  The current job configuration to adjust.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   * default partitioner.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * @throws IOException When determining the region count fails.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  public static void initTableReduceJob(String table,<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner)<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  throws IOException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    initTableReduceJob(table, reducer, job, partitioner, true);<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>  /**<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   * Use this before submitting a TableReduce job. It will<a name="line.259"></a>
-<span class="sourceLineNo">260</span>   * appropriately set up the JobConf.<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   *<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * @param table  The output table.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param reducer  The reducer class to use.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @param job  The current job configuration to adjust.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   * default partitioner.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.267"></a>
-<span class="sourceLineNo">268</span>   *           job classes via the distributed cache (tmpjars).<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   * @throws IOException When determining the region count fails.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  public static void initTableReduceJob(String table,<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner,<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    boolean addDependencyJars) throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    job.setOutputFormat(TableOutputFormat.class);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    job.setReducerClass(reducer);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    job.set(TableOutputFormat.OUTPUT_TABLE, table);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    job.setOutputKeyClass(ImmutableBytesWritable.class);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    job.setOutputValueClass(Put.class);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    if (partitioner == HRegionPartitioner.class) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      job.setPartitionerClass(HRegionPartitioner.class);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      int regions =<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      if (job.getNumReduceTasks() &gt; regions) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        job.setNumReduceTasks(regions);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    } else if (partitioner != null) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      job.setPartitionerClass(partitioner);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    if (addDependencyJars) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      addDependencyJars(job);<a name="line.292"></a>
+<span class="sourceLineNo">158</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * and read directly from snapshot files.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   *<a name="line.164"></a>
+<span class="sourceLineNo">165</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   * @param columns  The columns to scan.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   * @param mapper  The mapper class to use.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   * @param outputKeyClass  The class of the output key.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * @param outputValueClass  The class of the output value.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * @param job  The current job to adjust.  Make sure the passed job is<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * carrying all necessary HBase configuration.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   *           job classes via the distributed cache (tmpjars).<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   * After the job is finished, restore directory can be deleted.<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   * @throws IOException When setting up the details fails.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   * @see TableSnapshotInputFormat<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      Class&lt;? extends TableMap&gt; mapper,<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      Class&lt;?&gt; outputKeyClass,<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      Class&lt;?&gt; outputValueClass, JobConf job,<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      boolean addDependencyJars, Path tmpRestoreDir)<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  throws IOException {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      addDependencyJars, TableSnapshotInputFormat.class);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * and read directly from snapshot files.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   *<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * @param columns  The columns to scan.<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @param mapper  The mapper class to use.<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * @param outputKeyClass  The class of the output key.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   * @param outputValueClass  The class of the output value.<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   * @param jobConf  The current job to adjust.  Make sure the passed job is<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * carrying all necessary HBase configuration.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   *           job classes via the distributed cache (tmpjars).<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * After the job is finished, restore directory can be deleted.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * @param splitAlgo algorithm to split<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * @param numSplitsPerRegion how many input splits to generate per one region<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * @throws IOException When setting up the details fails.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * @see TableSnapshotInputFormat<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.213"></a>
+<span class="sourceLineNo">214</span>                                             Class&lt;? extends TableMap&gt; mapper,<a name="line.214"></a>
+<span class="sourceLineNo">215</span>                                             Class&lt;?&gt; outputKeyClass,<a name="line.215"></a>
+<span class="sourceLineNo">216</span>                                             Class&lt;?&gt; outputValueClass, JobConf jobConf,<a name="line.216"></a>
+<span class="sourceLineNo">217</span>                                             boolean addDependencyJars, Path tmpRestoreDir,<a name="line.217"></a>
+<span class="sourceLineNo">218</span>                                             RegionSplitter.SplitAlgorithm splitAlgo,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>                                             int numSplitsPerRegion)<a name="line.219"></a>
+<span class="sourceLineNo">220</span>          throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    TableSnapshotInputFormat.setInput(jobConf, snapshotName, tmpRestoreDir, splitAlgo,<a name="line.221"></a>
+<span class="sourceLineNo">222</span>            numSplitsPerRegion);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, jobConf,<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            addDependencyJars, TableSnapshotInputFormat.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(jobConf);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  }<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>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * Use this before submitting a TableReduce job. It will<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * appropriately set up the JobConf.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   *<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param table  The output table.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param reducer  The reducer class to use.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param job  The current job configuration to adjust.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @throws IOException When determining the region count fails.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  public static void initTableReduceJob(String table,<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job)<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    initTableReduceJob(table, reducer, job, null);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>  /**<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * Use this before submitting a TableReduce job. It will<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * appropriately set up the JobConf.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   *<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param table  The output table.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   * @param reducer  The reducer class to use.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   * @param job  The current job configuration to adjust.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   * default partitioner.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   * @throws IOException When determining the region count fails.<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   */<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  public static void initTableReduceJob(String table,<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner)<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  throws IOException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    initTableReduceJob(table, reducer, job, partitioner, true);<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>  /**<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   * Use this before submitting a TableReduce job. It will<a name="line.262"></a>
+<span class="sourceLineNo">263</span>   * appropriately set up the JobConf.<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   *<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param table  The output table.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @param reducer  The reducer class to use.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * @param job  The current job configuration to adjust.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   * default partitioner.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   *           job classes via the distributed cache (tmpjars).<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * @throws IOException When determining the region count fails.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   */<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  public static void initTableReduceJob(String table,<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner,<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    boolean addDependencyJars) throws IOException {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    job.setOutputFormat(TableOutputFormat.class);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    job.setReducerClass(reducer);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    job.set(TableOutputFormat.OUTPUT_TABLE, table);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    job.setOutputKeyClass(ImmutableBytesWritable.class);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    job.setOutputValueClass(Put.class);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    if (partitioner == HRegionPartitioner.class) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      job.setPartitionerClass(HRegionPartitioner.class);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      int regions =<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      if (job.getNumReduceTasks() &gt; regions) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        job.setNumReduceTasks(regions);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    } else if (partitioner != null) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      job.setPartitionerClass(partitioner);<a name="line.292"></a>
 <span class="sourceLineNo">293</span>    }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    initCredentials(job);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public static void initCredentials(JobConf job) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    UserProvider userProvider = UserProvider.instantiate(job);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    if (userProvider.isHadoopSecurityEnabled()) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      // propagate delegation related props from launcher job to MR job<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      if (System.getenv("HADOOP_TOKEN_FILE_LOCATION") != null) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        job.set("mapreduce.job.credentials.binary", System.getenv("HADOOP_TOKEN_FILE_LOCATION"));<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    if (userProvider.isHBaseSecurityEnabled()) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      Connection conn = ConnectionFactory.createConnection(job);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      try {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        // login the server principal (if using secure Hadoop)<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        User user = userProvider.getCurrent();<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        TokenUtil.addTokenForJob(conn, job, user);<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      } catch (InterruptedException ie) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        ie.printStackTrace();<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        Thread.currentThread().interrupt();<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      } finally {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        conn.close();<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    }<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>   * Ensures that the given number of reduce tasks for the given job<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * configuration does not exceed the number of regions for the given table.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   *<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   * @param table  The table to get the region count for.<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * @param job  The current job configuration to adjust.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   * @throws IOException When retrieving the table details fails.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  // Used by tests.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  public static void limitNumReduceTasks(String table, JobConf job)<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  throws IOException {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    int regions =<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    if (job.getNumReduceTasks() &gt; regions)<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      job.setNumReduceTasks(regions);<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>   * Ensures that the given number of map tasks for the given job<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * configuration does not exceed the number of regions for the given table.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   *<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   * @param table  The table to get the region count for.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>   * @param job  The current job configuration to adjust.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * @throws IOException When retrieving the table details fails.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   */<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  // Used by tests.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  public static void limitNumMapTasks(String table, JobConf job)<a name="line.347"></a>
-<span class="sourceLineNo">348</span>  throws IOException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    int regions =<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    if (job.getNumMapTasks() &gt; regions)<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      job.setNumMapTasks(regions);<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>  /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * Sets the number of reduce tasks for the given job configuration to the<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * number of regions the given table has.<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   *<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * @param table  The table to get the region count for.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * @param job  The current job configuration to adjust.<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * @throws IOException When retrieving the table details fails.<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   */<a name="line.362"></a>
-<span class="sourceLineNo">363</span>  public static void setNumReduceTasks(String table, JobConf job)<a name="line.363"></a>
-<span class="sourceLineNo">364</span>  throws IOException {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    job.setNumReduceTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      TableName.valueOf(table)));<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>  /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span>   * Sets the number of map tasks for the given job configuration to the<a name="line.370"></a>
-<span class="sourceLineNo">371</span>   * number of regions the given table has.<a name="line.371"></a>
-<span class="sourceLineNo">372</span>   *<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   * @param table  The table to get the region count for.<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   * @param job  The current job configuration to adjust.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @throws IOException When retrieving the table details fails.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public static void setNumMapTasks(String table, JobConf job)<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  throws IOException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    job.setNumMapTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      TableName.valueOf(table)));<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<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>   * Sets the number of rows to return and cache with each scanner iteration.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Higher caching values will enable faster mapreduce jobs at the expense of<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * requiring more heap to contain the cached rows.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   *<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param job The current job configuration to adjust.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @param batchSize The number of rows to return in batch with each scanner<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   * iteration.<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   */<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  public static void setScannerCaching(JobConf job, int batchSize) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    job.setInt("hbase.client.scanner.caching", batchSize);<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>   * @see org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil#addDependencyJars(org.apache.hadoop.mapreduce.Job)<a name="line.397"></a>
-<span class="sourceLineNo">398</span>   */<a name="line.398"></a>
-<span class="sourceLineNo">399</span>  public static void addDependencyJars(JobConf job) throws IOException {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addHBaseDependencyJars(job);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJarsForClasses(<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      job,<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      job.getMapOutputKeyClass(),<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      job.getMapOutputValueClass(),<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      job.getOutputKeyClass(),<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      job.getOutputValueClass(),<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      job.getPartitionerClass(),<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      job.getClass("mapred.input.format.class", TextInputFormat.class, InputFormat.class),<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      job.getClass("mapred.output.format.class", TextOutputFormat.class, OutputFormat.class),<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      job.getCombinerClass());<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">294</span>    if (addDependencyJars) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      addDependencyJars(job);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    initCredentials(job);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>  public static void initCredentials(JobConf job) throws IOException {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    UserProvider userProvider = UserProvider.instantiate(job);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    if (userProvider.isHadoopSecurityEnabled()) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      // propagate delegation related props from launcher job to MR job<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      if (System.getenv("HADOOP_TOKEN_FILE_LOCATION") != null) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        job.set("mapreduce.job.credentials.binary", System.getenv("HADOOP_TOKEN_FILE_LOCATION"));<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      }<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>    if (userProvider.isHBaseSecurityEnabled()) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      Connection conn = ConnectionFactory.createConnection(job);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      try {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        // login the server principal (if using secure Hadoop)<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        User user = userProvider.getCurrent();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        TokenUtil.addTokenForJob(conn, job, user);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      } catch (InterruptedException ie) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        LOG.error("Interrupted obtaining user authentication token", ie);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        Thread.currentThread().interrupt();<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      } finally {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        conn.close();<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>  }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>  /**<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   * Ensures that the given number of reduce tasks for the given job<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   * configuration does not exceed the number of regions for the given table.<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   *<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * @param table  The table to get the region count for.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * @param job  The current job configuration to adjust.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @throws IOException When retrieving the table details fails.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  // Used by tests.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void limitNumReduceTasks(String table, JobConf job)<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  throws IOException {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    int regions =<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    if (job.getNumReduceTasks() &gt; regions)<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      job.setNumReduceTasks(regions);<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>  /**<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * Ensures that the given number of map tasks for the given job<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   * configuration does not exceed the number of regions for the given table.<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   *<a name="line.344"></a>
+<span class="sourceLineNo">345</span>   * @param table  The table to get the region count for.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   * @param job  The current job configuration to adjust.<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * @throws IOException When retrieving the table details fails.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  // Used by tests.<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  public static void limitNumMapTasks(String table, JobConf job)<a name="line.350"></a>
+<span class="sourceLineNo">351</span>  throws IOException {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    int regions =<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    if (job.getNumMapTasks() &gt; regions)<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      job.setNumMapTasks(regions);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>  /**<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * Sets the number of reduce tasks for the given job configuration to the<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * number of regions the given table has.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   *<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * @param table  The table to get the region count for.<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * @param job  The current job configuration to adjust.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * @throws IOException When retrieving the table details fails.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   */<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  public static void setNumReduceTasks(String table, JobConf job)<a name="line.366"></a>
+<span class="sourceLineNo">367</span>  throws IOException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    job.setNumReduceTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      TableName.valueOf(table)));<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>  /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   * Sets the number of map tasks for the given job configuration to the<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   * number of regions the given table has.<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   *<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   * @param table  The table to get the region count for.<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * @param job  The current job configuration to adjust.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * @throws IOException When retrieving the table details fails.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   */<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  public static void setNumMapTasks(String table, JobConf job)<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    job.setNumMapTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      TableName.valueOf(table)));<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<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>   * Sets the number of rows to return and cache with each scanner iteration.<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * Higher caching values will enable faster mapreduce jobs at the expense of<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * requiring more heap to contain the cached rows.<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   *<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @param job The current job configuration to adjust.<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   * @param batchSize The number of rows to return in batch with each scanner<a name="line.392"></a>
+<span class="sourceLineNo">393</span>   * iteration.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  public static void setScannerCaching(JobConf job, int batchSize) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    job.setInt("hbase.client.scanner.caching", batchSize);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span>  /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   * @see org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil#addDependencyJars(org.apache.hadoop.mapreduce.Job)<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   */<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  public static void addDependencyJars(JobConf job) throws IOException {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addHBaseDependencyJars(job);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJarsForClasses(<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      job,<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      job.getMapOutputKeyClass(),<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      job.getMapOutputValueClass(),<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      job.getOutputKeyClass(),<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      job.getOutputValueClass(),<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      job.getPartitionerClass(),<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      job.getClass("mapred.input.format.class", TextInputFormat.class, InputFormat.class),<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      job.getClass("mapred.output.format.class", TextOutputFormat.class, OutputFormat.class),<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      job.getCombinerClass());<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>}<a name="line.415"></a>
 
 
 


[40/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/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 e8dda05..c59fb4b 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.47">TsvImporterMapper</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.49">TsvImporterMapper</a>
 extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,org.apache.hadoop.io.Text,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&gt;</pre>
 <div class="block">Write table content out to files in hdfs.</div>
 </li>
@@ -172,44 +172,48 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#kvCreator">kvCreator</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#logBadLines">logBadLines</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#parser">parser</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#separator">separator</a></span></code>
 <div class="block">Column seperator</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#skipBadLines">skipBadLines</a></span></code>
 <div class="block">Should skip bad lines</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#skipEmptyColumns">skipEmptyColumns</a></span></code>
 <div class="block">Should skip empty columns</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#tags">tags</a></span></code>
 <div class="block">List of cell tags</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#ts">ts</a></span></code>
 <div class="block">Timestamp for all inserted rows</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#ttl">ttl</a></span></code>&nbsp;</td>
 </tr>
@@ -317,13 +321,22 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.51">LOG</a></pre>
+</li>
+</ul>
 <a name="ts">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>ts</h4>
-<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.52">ts</a></pre>
+<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.54">ts</a></pre>
 <div class="block">Timestamp for all inserted rows</div>
 </li>
 </ul>
@@ -333,7 +346,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>separator</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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.55">separator</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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.57">separator</a></pre>
 <div class="block">Column seperator</div>
 </li>
 </ul>
@@ -343,7 +356,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>skipBadLines</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.58">skipBadLines</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.60">skipBadLines</a></pre>
 <div class="block">Should skip bad lines</div>
 </li>
 </ul>
@@ -353,7 +366,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>skipEmptyColumns</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.60">skipEmptyColumns</a></pre>
+<pre>private&nbsp;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>
@@ -363,7 +376,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>badLineCount</h4>
-<pre>private&nbsp;org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.61">badLineCount</a></pre>
+<pre>private&nbsp;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">
@@ -372,7 +385,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>logBadLines</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.62">logBadLines</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.64">logBadLines</a></pre>
 </li>
 </ul>
 <a name="parser">
@@ -381,7 +394,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>parser</h4>
-<pre>protected&nbsp;<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&nbsp;<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">
@@ -390,7 +403,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>conf</h4>
-<pre>protected&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.66">conf</a></pre>
+<pre>protected&nbsp;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">
@@ -399,7 +412,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>cellVisibilityExpr</h4>
-<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/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&nbsp;<a href="https://docs.oracle.com/javase/8/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">
@@ -408,7 +421,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>ttl</h4>
-<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.70">ttl</a></pre>
+<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.72">ttl</a></pre>
 </li>
 </ul>
 <a name="kvCreator">
@@ -417,7 +430,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>kvCreator</h4>
-<pre>protected&nbsp;<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&nbsp;<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">
@@ -426,7 +439,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>hfileOutPath</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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&nbsp;<a href="https://docs.oracle.com/javase/8/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">
@@ -435,7 +448,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>tags</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.77">tags</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt; <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>
@@ -453,7 +466,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TsvImporterMapper</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.47">TsvImporterMapper</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.49">TsvImporterMapper</a>()</pre>
 </li>
 </ul>
 </li>
@@ -470,7 +483,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getTs</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.79">getTs</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.81">getTs</a>()</pre>
 </li>
 </ul>
 <a name="getSkipBadLines--">
@@ -479,7 +492,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getSkipBadLines</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.83">getSkipBadLines</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.85">getSkipBadLines</a>()</pre>
 </li>
 </ul>
 <a name="getBadLineCount--">
@@ -488,7 +501,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getBadLineCount</h4>
-<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.87">getBadLineCount</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.89">getBadLineCount</a>()</pre>
 </li>
 </ul>
 <a name="incrementBadLineCount-int-">
@@ -497,7 +510,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementBadLineCount</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.91">incrementBadLineCount</a>(int&nbsp;count)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.93">incrementBadLineCount</a>(int&nbsp;count)</pre>
 </li>
 </ul>
 <a name="setup-org.apache.hadoop.mapreduce.Mapper.Context-">
@@ -506,7 +519,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>setup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.104">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.106">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;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
@@ -525,7 +538,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>doSetup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.121">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.123">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
 <div class="block">Handles common parameter initialization that a subclass might want to leverage.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -539,7 +552,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.149">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.151">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
                 org.apache.hadoop.io.Text&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -558,7 +571,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>populatePut</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.206">populatePut</a>(byte[]&nbsp;lineBytes,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.209">populatePut</a>(byte[]&nbsp;lineBytes,
                            <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.ParsedLine</a>&nbsp;parsed,
                            <a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
                            int&nbsp;i)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
index 98beb3f..b4bc0eb 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.36">TsvImporterTextMapper</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.38">TsvImporterTextMapper</a>
 extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,org.apache.hadoop.io.Text,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,org.apache.hadoop.io.Text&gt;</pre>
 <div class="block">Write table content out to map output files.</div>
 </li>
@@ -156,20 +156,24 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#badLineCount">badLineCount</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#logBadLines">logBadLines</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#parser">parser</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#separator">separator</a></span></code>
 <div class="block">Column seperator</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#skipBadLines">skipBadLines</a></span></code>
 <div class="block">Should skip bad lines</div>
@@ -268,13 +272,22 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.40">LOG</a></pre>
+</li>
+</ul>
 <a name="separator">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>separator</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/TsvImporterTextMapper.html#line.41">separator</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/TsvImporterTextMapper.html#line.43">separator</a></pre>
 <div class="block">Column seperator</div>
 </li>
 </ul>
@@ -284,7 +297,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>skipBadLines</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.44">skipBadLines</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.46">skipBadLines</a></pre>
 <div class="block">Should skip bad lines</div>
 </li>
 </ul>
@@ -294,7 +307,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>badLineCount</h4>
-<pre>private&nbsp;org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.45">badLineCount</a></pre>
+<pre>private&nbsp;org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.47">badLineCount</a></pre>
 </li>
 </ul>
 <a name="logBadLines">
@@ -303,7 +316,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>logBadLines</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.46">logBadLines</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.48">logBadLines</a></pre>
 </li>
 </ul>
 <a name="parser">
@@ -312,7 +325,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>parser</h4>
-<pre>private&nbsp;<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/TsvImporterTextMapper.html#line.48">parser</a></pre>
+<pre>private&nbsp;<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/TsvImporterTextMapper.html#line.50">parser</a></pre>
 </li>
 </ul>
 </li>
@@ -329,7 +342,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TsvImporterTextMapper</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.36">TsvImporterTextMapper</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.38">TsvImporterTextMapper</a>()</pre>
 </li>
 </ul>
 </li>
@@ -346,7 +359,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getSkipBadLines</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.50">getSkipBadLines</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.52">getSkipBadLines</a>()</pre>
 </li>
 </ul>
 <a name="getBadLineCount--">
@@ -355,7 +368,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>getBadLineCount</h4>
-<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.54">getBadLineCount</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.mapreduce.Counter&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.56">getBadLineCount</a>()</pre>
 </li>
 </ul>
 <a name="incrementBadLineCount-int-">
@@ -364,7 +377,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementBadLineCount</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.58">incrementBadLineCount</a>(int&nbsp;count)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.60">incrementBadLineCount</a>(int&nbsp;count)</pre>
 </li>
 </ul>
 <a name="setup-org.apache.hadoop.mapreduce.Mapper.Context-">
@@ -373,7 +386,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>setup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.71">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.73">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;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 subclass is done in
  <code>doSetup</code>. Hence a subclass may choose to override this method
@@ -392,7 +405,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>doSetup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.86">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.88">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
 <div class="block">Handles common parameter initialization that a subclass might want to leverage.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -406,7 +419,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.107">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#line.109">map</a>(org.apache.hadoop.io.LongWritable&nbsp;offset,
                 org.apache.hadoop.io.Text&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
index ec4b069..dbf9bb4 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
@@ -301,7 +301,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html#line.131">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html#line.132">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
index fd8ad63..588fe34 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>protected static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.144">WALPlayer.WALMapper</a>
+<pre>protected static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.145">WALPlayer.WALMapper</a>
 extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.html" title="interface in org.apache.hadoop.hbase.wal">WALKey</a>,<a href="../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a>,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>&gt;</pre>
 <div class="block">A mapper that writes out <a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client"><code>Mutation</code></a> to be directly applied to a running HBase instance.</div>
 </li>
@@ -246,7 +246,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockListLast">
 <li class="blockList">
 <h4>tables</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>,<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.146">tables</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>,<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.147">tables</a></pre>
 </li>
 </ul>
 </li>
@@ -263,7 +263,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WALMapper</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.144">WALMapper</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.145">WALMapper</a>()</pre>
 </li>
 </ul>
 </li>
@@ -280,7 +280,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockList">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.149">map</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.html" title="interface in org.apache.hadoop.hbase.wal">WALKey</a>&nbsp;key,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.150">map</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.html" title="interface in org.apache.hadoop.hbase.wal">WALKey</a>&nbsp;key,
                 <a href="../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a>&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -298,7 +298,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockList">
 <li class="blockList">
 <h4>filter</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.206">filter</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context,
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.208">filter</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context,
                          <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
 </li>
 </ul>
@@ -308,7 +308,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockList">
 <li class="blockList">
 <h4>cleanup</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.212">cleanup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.214">cleanup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <dl>
@@ -326,7 +326,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.218">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html#line.220">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
index c619aee..61e3f41 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
@@ -486,7 +486,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>setupTime</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.239">setupTime</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.241">setupTime</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;option)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -501,7 +501,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSubmittableJob</h4>
-<pre>public&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.267">createSubmittableJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.269">createSubmittableJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets up the actual job.</div>
 <dl>
@@ -520,7 +520,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableNameList</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.335">getTableNameList</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;tables)</pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.337">getTableNameList</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;tables)</pre>
 </li>
 </ul>
 <a name="usage-java.lang.String-">
@@ -529,7 +529,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.347">usage</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;errorMsg)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.349">usage</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;errorMsg)</pre>
 <div class="block">Print usage</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -543,7 +543,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.382">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.384">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>
@@ -560,7 +560,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.388">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html#line.390">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index bd6fd7e..2e21581 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -293,9 +293,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TableSplit.Version</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
index 1799704..abd92a9 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
@@ -198,8 +198,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.Action.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.LocalityType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.Action.Type</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 2a6bd56..5ce7ce6 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -348,10 +348,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index ddea7b8..d3f7afa 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -217,8 +217,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MetaProcedureInterface.MetaOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">MetaProcedureInterface.MetaOperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">ServerProcedureInterface.ServerOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 6abb0e4..990e7f7 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -437,19 +437,19 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/procedure2/Procedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/Procedure.html b/devapidocs/org/apache/hadoop/hbase/procedure2/Procedure.html
index 19a9ffb..9ac5570 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/Procedure.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/Procedure.html
@@ -2051,7 +2051,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>doAcquireLock</h4>
-<pre>final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2">Procedure.LockState</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.906">doAcquireLock</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&nbsp;env,
+<pre>final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2">Procedure.LockState</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.911">doAcquireLock</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&nbsp;env,
                                         <a href="../../../../../org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html" title="interface in org.apache.hadoop.hbase.procedure2.store">ProcedureStore</a>&nbsp;store)</pre>
 <div class="block">Internal method called by the ProcedureExecutor that starts the user-level code acquireLock().</div>
 </li>
@@ -2064,7 +2064,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>doReleaseLock</h4>
-<pre>final&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.935">doReleaseLock</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&nbsp;env,
+<pre>final&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.940">doReleaseLock</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&nbsp;env,
                          <a href="../../../../../org/apache/hadoop/hbase/procedure2/store/ProcedureStore.html" title="interface in org.apache.hadoop.hbase.procedure2.store">ProcedureStore</a>&nbsp;store)</pre>
 <div class="block">Internal method called by the ProcedureExecutor that starts the user-level code releaseLock().</div>
 </li>
@@ -2075,7 +2075,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>compareTo</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.950">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&gt;&nbsp;other)</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.955">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&gt;&nbsp;other)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true#compareTo-T-" title="class or interface in java.lang">compareTo</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="type parameter in Procedure">TEnvironment</a>&gt;&gt;</code></dd>
@@ -2088,7 +2088,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcIdHashCode</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.962">getProcIdHashCode</a>(long&nbsp;procId)</pre>
+<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.967">getProcIdHashCode</a>(long&nbsp;procId)</pre>
 <div class="block">Get an hashcode for the specified Procedure ID</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -2102,7 +2102,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>getRootProcedureId</h4>
-<pre>protected static&nbsp;&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.975">getRootProcedureId</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>,<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;T&gt;&gt;&nbsp;procedures,
+<pre>protected static&nbsp;&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.980">getRootProcedureId</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>,<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;T&gt;&gt;&nbsp;procedures,
                                              <a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;T&gt;&nbsp;proc)</pre>
 <div class="block">Helper to lookup the root Procedure ID given a specified procedure.</div>
 </li>
@@ -2113,7 +2113,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>haveSameParent</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.991">haveSameParent</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;?&gt;&nbsp;a,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/procedure2/Procedure.html#line.996">haveSameParent</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;?&gt;&nbsp;a,
                                      <a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;?&gt;&nbsp;b)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 12c3557..9671577 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -216,10 +216,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockedResourceType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockedResourceType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html b/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
index e40d6ef..c4f07ef 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
@@ -120,7 +120,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>@InterfaceAudience.LimitedPrivate(value="Tools")
  @InterfaceStability.Evolving
-public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.53">ProcedureWALPrettyPrinter</a>
+public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.55">ProcedureWALPrettyPrinter</a>
 extends org.apache.hadoop.conf.Configured
 implements org.apache.hadoop.util.Tool</pre>
 <div class="block">ProcedureWALPrettyPrinter prints the contents of a given ProcedureWAL file</div>
@@ -143,6 +143,10 @@ implements org.apache.hadoop.util.Tool</pre>
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#out">out</a></span></code>&nbsp;</td>
 </tr>
@@ -248,13 +252,22 @@ implements org.apache.hadoop.util.Tool</pre>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.56">LOG</a></pre>
+</li>
+</ul>
 <a name="out">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>out</h4>
-<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.54">out</a></pre>
+<pre>private final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.58">out</a></pre>
 </li>
 </ul>
 </li>
@@ -271,7 +284,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ProcedureWALPrettyPrinter</h4>
-<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.56">ProcedureWALPrettyPrinter</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.60">ProcedureWALPrettyPrinter</a>()</pre>
 </li>
 </ul>
 </li>
@@ -288,7 +301,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>processFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.67">processFile</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.71">processFile</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                         org.apache.hadoop.fs.Path&nbsp;p)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Reads a log file and outputs its contents.</div>
@@ -307,7 +320,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>processProcedureWALFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.91">processProcedureWALFile</a>(<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.html" title="class in org.apache.hadoop.hbase.procedure2.store.wal">ProcedureWALFile</a>&nbsp;log)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.95">processProcedureWALFile</a>(<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.html" title="class in org.apache.hadoop.hbase.procedure2.store.wal">ProcedureWALFile</a>&nbsp;log)
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -321,7 +334,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>printEntry</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.122">printEntry</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALEntry&nbsp;entry)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.126">printEntry</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALEntry&nbsp;entry)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -335,7 +348,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>printProcedure</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.131">printProcedure</a>(<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;?&gt;&nbsp;proc)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.135">printProcedure</a>(<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/Procedure.html" title="class in org.apache.hadoop.hbase.procedure2">Procedure</a>&lt;?&gt;&nbsp;proc)</pre>
 </li>
 </ul>
 <a name="printHeader-org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALHeader-">
@@ -344,7 +357,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>printHeader</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.135">printHeader</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALHeader&nbsp;header)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.139">printHeader</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALHeader&nbsp;header)</pre>
 </li>
 </ul>
 <a name="run-java.lang.String:A-">
@@ -353,7 +366,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.154">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.158">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Pass one or more log file names and formatting options and it will dump out
  a text version of the contents on <code>stdout</code>.</div>
@@ -373,7 +386,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.186">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../../src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#line.190">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index c4b118c..2c5f4d8 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -229,12 +229,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottlingException.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
 </ul>
 </li>


[44/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
index 9501e97..a10ddfe 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
@@ -131,277 +131,279 @@
 <span class="sourceLineNo">123</span>          }<a name="line.123"></a>
 <span class="sourceLineNo">124</span>        }<a name="line.124"></a>
 <span class="sourceLineNo">125</span>      } catch (InterruptedException e) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        e.printStackTrace();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void setup(Context context) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      Configuration conf = context.getConfiguration();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      for (String table : tables) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        tableSet.add(table);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  protected static class WALMapper<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>          TableName targetTable =<a name="line.152"></a>
-<span class="sourceLineNo">153</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.154"></a>
-<span class="sourceLineNo">155</span>          Put put = null;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          Delete del = null;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          Cell lastCell = null;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          for (Cell cell : value.getCells()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>            // filtering WAL meta entries<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>              continue;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>            }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>            // Allow a subclass filter out this cell.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>            if (filter(context, cell)) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.166"></a>
-<span class="sourceLineNo">167</span>              // multiple rows (HBASE-5229).<a name="line.167"></a>
-<span class="sourceLineNo">168</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.168"></a>
-<span class="sourceLineNo">169</span>              // operation before writing to the context.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>                // row or type changed, write out aggregate KVs.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                if (put != null) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                  context.write(tableOut, put);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                if (del != null) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                  context.write(tableOut, del);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                if (CellUtil.isDelete(cell)) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                } else {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.182"></a>
-<span class="sourceLineNo">183</span>                }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>              }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>              if (CellUtil.isDelete(cell)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>                del.add(cell);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>              } else {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>                put.add(cell);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>              }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>            lastCell = cell;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>          }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>          // write residual KVs<a name="line.193"></a>
-<span class="sourceLineNo">194</span>          if (put != null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            context.write(tableOut, put);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>          }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>          if (del != null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>            context.write(tableOut, del);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>          }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      } catch (InterruptedException e) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        e.printStackTrace();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>    protected boolean filter(Context context, final Cell cell) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      return true;<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>    @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    protected void<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            throws IOException, InterruptedException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      super.cleanup(context);<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>    @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    public void setup(Context context) throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      if (tableMap == null) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        tableMap = tablesToUse;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      if (tablesToUse == null) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        // Then user wants all tables.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      int i = 0;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      if (tablesToUse != null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        for (String table : tablesToUse) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
-<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><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    String val = conf.get(option);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    if (null == val) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    long ms;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    try {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      // first try to parse in user friendly form<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    } catch (ParseException pe) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      try {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        // then see if just a number of ms's was specified<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        ms = Long.parseLong(val);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      } catch (NumberFormatException nfe) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        throw new IOException(<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                + "or as number of milliseconds");<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>    conf.setLong(option, ms);<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>  /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * Sets up the actual job.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param args The command line parameters.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @return The newly created job.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @throws IOException When setting up the job fails.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   */<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    Configuration conf = getConf();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    String inputDirs = args[0];<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    String[] tables = args[1].split(",");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    String[] tableMap;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if (args.length &gt; 2) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      tableMap = args[2].split(",");<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      if (tableMap.length != tables.length) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    } else {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      // if not mapping is specified map each table to itself<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      tableMap = tables;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    Job job =<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    job.setJarByClass(WALPlayer.class);<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (hfileOutPath != null) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>      // the bulk HFile case<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      job.setReducerClass(CellSortReducer.class);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      Path outputDir = new Path(hfileOutPath);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        for (TableName tableName : tableNames) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          Table table = conn.getTable(tableName);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      // output to live cluster<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      job.setMapperClass(WALMapper.class);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      TableMapReduceUtil.initCredentials(job);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // No reducers.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      job.setNumReduceTasks(0);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    try {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        Class.forName(codecCls));<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    } catch (Exception e) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    return job;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    for (String name : tables) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      list.add(TableName.valueOf(name));<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    return list;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>  /**<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * Print usage<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * @param errorMsg Error message. Can be null.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  private void usage(final String errorMsg) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      System.err.println("ERROR: " + errorMsg);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Time range options:");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    System.err.println("Other options:");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    System.err.println("For performance also consider the following options:\n"<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        + "  -Dmapreduce.reduce.speculative=false");<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>  /**<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   * Main entry point.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * @param args The command line parameters.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   * @throws Exception When running the job fails.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  public static void main(String[] args) throws Exception {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    System.exit(ret);<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>  @Override<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  public int run(String[] args) throws Exception {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " + args.length);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      System.exit(-1);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Job job = createSubmittableJob(args);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 0 : 1;<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">126</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        Thread.currentThread().interrupt();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    public void setup(Context context) throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Configuration conf = context.getConfiguration();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      for (String table : tables) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        tableSet.add(table);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  protected static class WALMapper<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      try {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>          TableName targetTable =<a name="line.153"></a>
+<span class="sourceLineNo">154</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>          Put put = null;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          Delete del = null;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          Cell lastCell = null;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>          for (Cell cell : value.getCells()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            // filtering WAL meta entries<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>              continue;<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>            // Allow a subclass filter out this cell.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            if (filter(context, cell)) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.167"></a>
+<span class="sourceLineNo">168</span>              // multiple rows (HBASE-5229).<a name="line.168"></a>
+<span class="sourceLineNo">169</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.169"></a>
+<span class="sourceLineNo">170</span>              // operation before writing to the context.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                // row or type changed, write out aggregate KVs.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                if (put != null) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>                  context.write(tableOut, put);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                }<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                if (del != null) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>                  context.write(tableOut, del);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>                if (CellUtil.isDelete(cell)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>                } else {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.183"></a>
+<span class="sourceLineNo">184</span>                }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>              }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>              if (CellUtil.isDelete(cell)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>                del.add(cell);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>              } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>                put.add(cell);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>              }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>            lastCell = cell;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>          }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          // write residual KVs<a name="line.194"></a>
+<span class="sourceLineNo">195</span>          if (put != null) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            context.write(tableOut, put);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>          }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          if (del != null) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            context.write(tableOut, del);<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>      } catch (InterruptedException e) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        LOG.error("Interrupted while writing results", e);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        Thread.currentThread().interrupt();<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 boolean filter(Context context, final Cell cell) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      return true;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    protected void<a name="line.213"></a>
+<span class="sourceLineNo">214</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            throws IOException, InterruptedException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      super.cleanup(context);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    public void setup(Context context) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      if (tableMap == null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        tableMap = tablesToUse;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if (tablesToUse == null) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        // Then user wants all tables.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      int i = 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (tablesToUse != null) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        for (String table : tablesToUse) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<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>    }<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>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    String val = conf.get(option);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (null == val) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      return;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    long ms;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    try {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      // first try to parse in user friendly form<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    } catch (ParseException pe) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      try {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        // then see if just a number of ms's was specified<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        ms = Long.parseLong(val);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      } catch (NumberFormatException nfe) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        throw new IOException(<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.256"></a>
+<span class="sourceLineNo">257</span>                + "or as number of milliseconds");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    conf.setLong(option, ms);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  /**<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   * Sets up the actual job.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param args The command line parameters.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @return The newly created job.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * @throws IOException When setting up the job fails.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    Configuration conf = getConf();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    String inputDirs = args[0];<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    String[] tables = args[1].split(",");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    String[] tableMap;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    if (args.length &gt; 2) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      tableMap = args[2].split(",");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (tableMap.length != tables.length) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    } else {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      // if not mapping is specified map each table to itself<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      tableMap = tables;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    Job job =<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    job.setJarByClass(WALPlayer.class);<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    if (hfileOutPath != null) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>      // the bulk HFile case<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      job.setReducerClass(CellSortReducer.class);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      Path outputDir = new Path(hfileOutPath);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        for (TableName tableName : tableNames) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          Table table = conn.getTable(tableName);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    } else {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      // output to live cluster<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      job.setMapperClass(WALMapper.class);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      TableMapReduceUtil.initCredentials(job);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // No reducers.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      job.setNumReduceTasks(0);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        Class.forName(codecCls));<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } catch (Exception e) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    return job;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    for (String name : tables) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      list.add(TableName.valueOf(name));<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    return list;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>  }<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>   * Print usage<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * @param errorMsg Error message. Can be null.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  private void usage(final String errorMsg) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      System.err.println("ERROR: " + errorMsg);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    System.err.println("Time range options:");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("Other options:");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    System.err.println("For performance also consider the following options:\n"<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        + "  -Dmapreduce.reduce.speculative=false");<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>   * Main entry point.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @param args The command line parameters.<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @throws Exception When running the job fails.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  public static void main(String[] args) throws Exception {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    System.exit(ret);<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>  @Override<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  public int run(String[] args) throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    if (args.length &lt; 2) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      usage("Wrong number of arguments: " + args.length);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      System.exit(-1);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    Job job = createSubmittableJob(args);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    return job.waitForCompletion(true) ? 0 : 1;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>}<a name="line.398"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 8b4dfc5..8ab7b70 100644
--- a/book.html
+++ b/book.html
@@ -41148,7 +41148,7 @@ org/apache/hadoop/hbase/security/access/AccessControlClient.revoke:(Lorg/apache/
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-08-15 14:30:43 UTC
+Last updated 2018-08-16 14:29:53 UTC
 </div>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index a10609d..7cd8408 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Bulk Loads in Apache HBase (TM)
@@ -306,7 +306,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 


[15/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[17/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
index f6d4321..dc69851 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
@@ -58,379 +58,383 @@
 <span class="sourceLineNo">050</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.PosixParser;<a name="line.50"></a>
 <span class="sourceLineNo">051</span><a name="line.51"></a>
 <span class="sourceLineNo">052</span>import com.fasterxml.jackson.databind.ObjectMapper;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * WALPrettyPrinter prints the contents of a given WAL with a variety of<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * options affecting formatting and extent of content.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * It targets two usage cases: pretty printing for ease of debugging directly by<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * humans, and JSON output for consumption by monitoring and/or maintenance<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * scripts.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * It can filter by row, region, or sequence id.<a name="line.62"></a>
+<span class="sourceLineNo">053</span>import org.slf4j.Logger;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.slf4j.LoggerFactory;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>/**<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * WALPrettyPrinter prints the contents of a given WAL with a variety of<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * options affecting formatting and extent of content.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * It targets two usage cases: pretty printing for ease of debugging directly by<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * humans, and JSON output for consumption by monitoring and/or maintenance<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * scripts.<a name="line.62"></a>
 <span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * It can also toggle output of values.<a name="line.64"></a>
+<span class="sourceLineNo">064</span> * It can filter by row, region, or sequence id.<a name="line.64"></a>
 <span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>@InterfaceStability.Evolving<a name="line.68"></a>
-<span class="sourceLineNo">069</span>public class WALPrettyPrinter {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  private boolean outputValues;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private boolean outputJSON;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  // The following enable filtering by sequence, region, and row, respectively<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  private long sequence;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  private String region;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  private String row;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  // enable in order to output a single list of transactions from several files<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  private boolean persistentOutput;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  private boolean firstTxn;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  // useful for programmatic capture of JSON output<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  private PrintStream out;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  // for JSON encoding<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private static final ObjectMapper MAPPER = new ObjectMapper();<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>   * Basic constructor that simply initializes values to reasonable defaults.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public WALPrettyPrinter() {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    outputValues = false;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    outputJSON = false;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    sequence = -1;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    region = null;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    row = null;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    persistentOutput = false;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    firstTxn = true;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    out = System.out;<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>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Fully specified constructor.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   *<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @param outputValues<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   *          when true, enables output of values along with other log<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   *          information<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @param outputJSON<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   *          when true, enables output in JSON format rather than a<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   *          "pretty string"<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   * @param sequence<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   *          when nonnegative, serves as a filter; only log entries with this<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   *          sequence id will be printed<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * @param region<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   *          when not null, serves as a filter; only log entries from this<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   *          region will be printed<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @param row<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   *          when not null, serves as a filter; only log entries from this row<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   *          will be printed<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * @param persistentOutput<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   *          keeps a single list running for multiple files. if enabled, the<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   *          endPersistentOutput() method must be used!<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * @param out<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   *          Specifies an alternative to stdout for the destination of this<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   *          PrettyPrinter's output.<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public WALPrettyPrinter(boolean outputValues, boolean outputJSON,<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      long sequence, String region, String row, boolean persistentOutput,<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      PrintStream out) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    this.outputValues = outputValues;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    this.outputJSON = outputJSON;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    this.sequence = sequence;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    this.region = region;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    this.row = row;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    this.persistentOutput = persistentOutput;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    if (persistentOutput) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      beginPersistentOutput();<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    this.out = out;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    this.firstTxn = true;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  /**<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   * turns value output on<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  public void enableValues() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    outputValues = true;<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>  /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   * turns value output off<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   */<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public void disableValues() {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    outputValues = false;<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>  /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * turns JSON output on<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public void enableJSON() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    outputJSON = true;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  /**<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   * turns JSON output off, and turns on "pretty strings" for human consumption<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  public void disableJSON() {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    outputJSON = false;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>  /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * sets the region by which output will be filtered<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   *<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   * @param sequence<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   *          when nonnegative, serves as a filter; only log entries with this<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   *          sequence id will be printed<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  public void setSequenceFilter(long sequence) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    this.sequence = sequence;<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>  /**<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * sets the region by which output will be filtered<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   *<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   * @param region<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   *          when not null, serves as a filter; only log entries from this<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   *          region will be printed<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   */<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  public void setRegionFilter(String region) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    this.region = region;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>  /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   * sets the region by which output will be filtered<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   *<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   * @param row<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   *          when not null, serves as a filter; only log entries from this row<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   *          will be printed<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  public void setRowFilter(String row) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    this.row = row;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * enables output as a single, persistent list. at present, only relevant in<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   * the case of JSON output.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  public void beginPersistentOutput() {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    if (persistentOutput)<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      return;<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    persistentOutput = true;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    firstTxn = true;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    if (outputJSON)<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      out.print("[");<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>  /**<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   * ends output of a single, persistent list. at present, only relevant in the<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * case of JSON output.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  public void endPersistentOutput() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    if (!persistentOutput)<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      return;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    persistentOutput = false;<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    if (outputJSON)<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      out.print("]");<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>  /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   * reads a log file and outputs its contents, one transaction at a time, as<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   * specified by the currently configured options<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   *<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * @param conf<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   *          the HBase configuration relevant to this log file<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   * @param p<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   *          the path of the log file to be read<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @throws IOException<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   *           may be unable to access the configured filesystem or requested<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   *           file.<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  public void processFile(final Configuration conf, final Path p)<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      throws IOException {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    FileSystem fs = p.getFileSystem(conf);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    if (!fs.exists(p)) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      throw new FileNotFoundException(p.toString());<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    if (!fs.isFile(p)) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      throw new IOException(p + " is not a file");<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>    WAL.Reader log = WALFactory.createReader(fs, p, conf);<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>    if (log instanceof ProtobufLogReader) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      List&lt;String&gt; writerClsNames = ((ProtobufLogReader) log).getWriterClsNames();<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      if (writerClsNames != null &amp;&amp; writerClsNames.size() &gt; 0) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        out.print("Writer Classes: ");<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        for (int i = 0; i &lt; writerClsNames.size(); i++) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>          out.print(writerClsNames.get(i));<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          if (i != writerClsNames.size() - 1) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>            out.print(" ");<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        }<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        out.println();<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>      String cellCodecClsName = ((ProtobufLogReader) log).getCodecClsName();<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      if (cellCodecClsName != null) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        out.println("Cell Codec Class: " + cellCodecClsName);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    if (outputJSON &amp;&amp; !persistentOutput) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      out.print("[");<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      firstTxn = true;<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>    try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      WAL.Entry entry;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      while ((entry = log.next()) != null) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>        WALKey key = entry.getKey();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        WALEdit edit = entry.getEdit();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        // begin building a transaction structure<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        Map&lt;String, Object&gt; txn = key.toStringMap();<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        long writeTime = key.getWriteTime();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        // check output filters<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        if (sequence &gt;= 0 &amp;&amp; ((Long) txn.get("sequence")) != sequence)<a name="line.282"></a>
-<span class="sourceLineNo">283</span>          continue;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        if (region != null &amp;&amp; !((String) txn.get("region")).equals(region))<a name="line.284"></a>
-<span class="sourceLineNo">285</span>          continue;<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        // initialize list into which we will store atomic actions<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        List&lt;Map&gt; actions = new ArrayList&lt;&gt;();<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        for (Cell cell : edit.getCells()) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>          // add atomic operation to txn<a name="line.289"></a>
-<span class="sourceLineNo">290</span>          Map&lt;String, Object&gt; op = new HashMap&lt;&gt;(toStringMap(cell));<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          if (outputValues) op.put("value", Bytes.toStringBinary(CellUtil.cloneValue(cell)));<a name="line.291"></a>
-<span class="sourceLineNo">292</span>          // check row output filter<a name="line.292"></a>
-<span class="sourceLineNo">293</span>          if (row == null || ((String) op.get("row")).equals(row)) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>            actions.add(op);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>          }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        }<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        if (actions.isEmpty())<a name="line.297"></a>
-<span class="sourceLineNo">298</span>          continue;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        txn.put("actions", actions);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        if (outputJSON) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>          // JSON output is a straightforward "toString" on the txn object<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          if (firstTxn)<a name="line.302"></a>
-<span class="sourceLineNo">303</span>            firstTxn = false;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>          else<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            out.print(",");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          // encode and print JSON<a name="line.306"></a>
-<span class="sourceLineNo">307</span>          out.print(MAPPER.writeValueAsString(txn));<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        } else {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>          // Pretty output, complete with indentation by atomic action<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          out.println("Sequence=" + txn.get("sequence") + " "<a name="line.310"></a>
-<span class="sourceLineNo">311</span>              + ", region=" + txn.get("region") + " at write timestamp=" + new Date(writeTime));<a name="line.311"></a>
-<span class="sourceLineNo">312</span>          for (int i = 0; i &lt; actions.size(); i++) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>            Map op = actions.get(i);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>            out.println("row=" + op.get("row") +<a name="line.314"></a>
-<span class="sourceLineNo">315</span>                ", column=" + op.get("family") + ":" + op.get("qualifier"));<a name="line.315"></a>
-<span class="sourceLineNo">316</span>            if (op.get("tag") != null) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>              out.println("    tag: " + op.get("tag"));<a name="line.317"></a>
-<span class="sourceLineNo">318</span>            }<a name="line.318"></a>
-<span class="sourceLineNo">319</span>            if (outputValues) out.println("    value: " + op.get("value"));<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>      }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    } finally {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      log.close();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    if (outputJSON &amp;&amp; !persistentOutput) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      out.print("]");<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>  private static Map&lt;String, Object&gt; toStringMap(Cell cell) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    Map&lt;String, Object&gt; stringMap = new HashMap&lt;&gt;();<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    stringMap.put("row",<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        Bytes.toStringBinary(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength()));<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    stringMap.put("family", Bytes.toStringBinary(cell.getFamilyArray(), cell.getFamilyOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>                cell.getFamilyLength()));<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    stringMap.put("qualifier",<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        Bytes.toStringBinary(cell.getQualifierArray(), cell.getQualifierOffset(),<a name="line.338"></a>
-<span class="sourceLineNo">339</span>            cell.getQualifierLength()));<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    stringMap.put("timestamp", cell.getTimestamp());<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    stringMap.put("vlen", cell.getValueLength());<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    if (cell.getTagsLength() &gt; 0) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      List&lt;String&gt; tagsString = new ArrayList&lt;&gt;();<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      Iterator&lt;Tag&gt; tagsIterator = PrivateCellUtil.tagsIterator(cell);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      while (tagsIterator.hasNext()) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        Tag tag = tagsIterator.next();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        tagsString<a name="line.347"></a>
-<span class="sourceLineNo">348</span>            .add((tag.getType()) + ":" + Bytes.toStringBinary(Tag.cloneValue(tag)));<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      }<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      stringMap.put("tag", tagsString);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    return stringMap;<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 static void main(String[] args) throws IOException {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    run(args);<a name="line.356"></a>
+<span class="sourceLineNo">066</span> * It can also toggle output of values.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> *<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.69"></a>
+<span class="sourceLineNo">070</span>@InterfaceStability.Evolving<a name="line.70"></a>
+<span class="sourceLineNo">071</span>public class WALPrettyPrinter {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  private static final Logger LOG = LoggerFactory.getLogger(WALPrettyPrinter.class);<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  private boolean outputValues;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private boolean outputJSON;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  // The following enable filtering by sequence, region, and row, respectively<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  private long sequence;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  private String region;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  private String row;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  // enable in order to output a single list of transactions from several files<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  private boolean persistentOutput;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  private boolean firstTxn;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  // useful for programmatic capture of JSON output<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  private PrintStream out;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  // for JSON encoding<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  private static final ObjectMapper MAPPER = new ObjectMapper();<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>   * Basic constructor that simply initializes values to reasonable defaults.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public WALPrettyPrinter() {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    outputValues = false;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    outputJSON = false;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    sequence = -1;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    region = null;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    row = null;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    persistentOutput = false;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    firstTxn = true;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    out = System.out;<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * Fully specified constructor.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param outputValues<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   *          when true, enables output of values along with other log<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   *          information<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @param outputJSON<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   *          when true, enables output in JSON format rather than a<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   *          "pretty string"<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * @param sequence<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   *          when nonnegative, serves as a filter; only log entries with this<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   *          sequence id will be printed<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   * @param region<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   *          when not null, serves as a filter; only log entries from this<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   *          region will be printed<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * @param row<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   *          when not null, serves as a filter; only log entries from this row<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   *          will be printed<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * @param persistentOutput<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   *          keeps a single list running for multiple files. if enabled, the<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   *          endPersistentOutput() method must be used!<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * @param out<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   *          Specifies an alternative to stdout for the destination of this<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   *          PrettyPrinter's output.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   */<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public WALPrettyPrinter(boolean outputValues, boolean outputJSON,<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      long sequence, String region, String row, boolean persistentOutput,<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      PrintStream out) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    this.outputValues = outputValues;<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    this.outputJSON = outputJSON;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    this.sequence = sequence;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    this.region = region;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    this.row = row;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    this.persistentOutput = persistentOutput;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    if (persistentOutput) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      beginPersistentOutput();<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    this.out = out;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    this.firstTxn = true;<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>   * turns value output on<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  public void enableValues() {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    outputValues = true;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * turns value output off<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   */<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  public void disableValues() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    outputValues = false;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  }<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>   * turns JSON output on<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   */<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public void enableJSON() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    outputJSON = true;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  }<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>   * turns JSON output off, and turns on "pretty strings" for human consumption<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   */<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  public void disableJSON() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    outputJSON = false;<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * sets the region by which output will be filtered<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   *<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @param sequence<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   *          when nonnegative, serves as a filter; only log entries with this<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   *          sequence id will be printed<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   */<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  public void setSequenceFilter(long sequence) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    this.sequence = sequence;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>  /**<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   * sets the region by which output will be filtered<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   *<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   * @param region<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   *          when not null, serves as a filter; only log entries from this<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   *          region will be printed<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  public void setRegionFilter(String region) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    this.region = region;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>  /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * sets the region by which output will be filtered<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   *<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param row<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   *          when not null, serves as a filter; only log entries from this row<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   *          will be printed<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  public void setRowFilter(String row) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    this.row = row;<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>   * enables output as a single, persistent list. at present, only relevant in<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * the case of JSON output.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  public void beginPersistentOutput() {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    if (persistentOutput)<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      return;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    persistentOutput = true;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    firstTxn = true;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    if (outputJSON)<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      out.print("[");<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>  /**<a name="line.217"></a>
+<span class="sourceLineNo">218</span>   * ends output of a single, persistent list. at present, only relevant in the<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   * case of JSON output.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>   */<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  public void endPersistentOutput() {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    if (!persistentOutput)<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      return;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    persistentOutput = false;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    if (outputJSON)<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      out.print("]");<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>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * reads a log file and outputs its contents, one transaction at a time, as<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * specified by the currently configured options<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   *<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param conf<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   *          the HBase configuration relevant to this log file<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param p<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   *          the path of the log file to be read<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * @throws IOException<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   *           may be unable to access the configured filesystem or requested<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   *           file.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>   */<a name="line.240"></a>
+<span class="sourceLineNo">241</span>  public void processFile(final Configuration conf, final Path p)<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      throws IOException {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    FileSystem fs = p.getFileSystem(conf);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    if (!fs.exists(p)) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      throw new FileNotFoundException(p.toString());<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    if (!fs.isFile(p)) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      throw new IOException(p + " is not a file");<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>    WAL.Reader log = WALFactory.createReader(fs, p, conf);<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    if (log instanceof ProtobufLogReader) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      List&lt;String&gt; writerClsNames = ((ProtobufLogReader) log).getWriterClsNames();<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (writerClsNames != null &amp;&amp; writerClsNames.size() &gt; 0) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        out.print("Writer Classes: ");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        for (int i = 0; i &lt; writerClsNames.size(); i++) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>          out.print(writerClsNames.get(i));<a name="line.258"></a>
+<span class="sourceLineNo">259</span>          if (i != writerClsNames.size() - 1) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>            out.print(" ");<a name="line.260"></a>
+<span class="sourceLineNo">261</span>          }<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        }<a name="line.262"></a>
+<span class="sourceLineNo">263</span>        out.println();<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>      String cellCodecClsName = ((ProtobufLogReader) log).getCodecClsName();<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      if (cellCodecClsName != null) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        out.println("Cell Codec Class: " + cellCodecClsName);<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      }<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>    if (outputJSON &amp;&amp; !persistentOutput) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      out.print("[");<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      firstTxn = true;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>    try {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      WAL.Entry entry;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      while ((entry = log.next()) != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        WALKey key = entry.getKey();<a name="line.280"></a>
+<span class="sourceLineNo">281</span>        WALEdit edit = entry.getEdit();<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        // begin building a transaction structure<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        Map&lt;String, Object&gt; txn = key.toStringMap();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        long writeTime = key.getWriteTime();<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        // check output filters<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        if (sequence &gt;= 0 &amp;&amp; ((Long) txn.get("sequence")) != sequence)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>          continue;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        if (region != null &amp;&amp; !((String) txn.get("region")).equals(region))<a name="line.288"></a>
+<span class="sourceLineNo">289</span>          continue;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        // initialize list into which we will store atomic actions<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        List&lt;Map&gt; actions = new ArrayList&lt;&gt;();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        for (Cell cell : edit.getCells()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>          // add atomic operation to txn<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          Map&lt;String, Object&gt; op = new HashMap&lt;&gt;(toStringMap(cell));<a name="line.294"></a>
+<span class="sourceLineNo">295</span>          if (outputValues) op.put("value", Bytes.toStringBinary(CellUtil.cloneValue(cell)));<a name="line.295"></a>
+<span class="sourceLineNo">296</span>          // check row output filter<a name="line.296"></a>
+<span class="sourceLineNo">297</span>          if (row == null || ((String) op.get("row")).equals(row)) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>            actions.add(op);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>          }<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        if (actions.isEmpty())<a name="line.301"></a>
+<span class="sourceLineNo">302</span>          continue;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>        txn.put("actions", actions);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if (outputJSON) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          // JSON output is a straightforward "toString" on the txn object<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          if (firstTxn)<a name="line.306"></a>
+<span class="sourceLineNo">307</span>            firstTxn = false;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>          else<a name="line.308"></a>
+<span class="sourceLineNo">309</span>            out.print(",");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          // encode and print JSON<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          out.print(MAPPER.writeValueAsString(txn));<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        } else {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>          // Pretty output, complete with indentation by atomic action<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          out.println("Sequence=" + txn.get("sequence") + " "<a name="line.314"></a>
+<span class="sourceLineNo">315</span>              + ", region=" + txn.get("region") + " at write timestamp=" + new Date(writeTime));<a name="line.315"></a>
+<span class="sourceLineNo">316</span>          for (int i = 0; i &lt; actions.size(); i++) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>            Map op = actions.get(i);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>            out.println("row=" + op.get("row") +<a name="line.318"></a>
+<span class="sourceLineNo">319</span>                ", column=" + op.get("family") + ":" + op.get("qualifier"));<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            if (op.get("tag") != null) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>              out.println("    tag: " + op.get("tag"));<a name="line.321"></a>
+<span class="sourceLineNo">322</span>            }<a name="line.322"></a>
+<span class="sourceLineNo">323</span>            if (outputValues) out.println("    value: " + op.get("value"));<a name="line.323"></a>
+<span class="sourceLineNo">324</span>          }<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    } finally {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      log.close();<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    if (outputJSON &amp;&amp; !persistentOutput) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      out.print("]");<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>  private static Map&lt;String, Object&gt; toStringMap(Cell cell) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    Map&lt;String, Object&gt; stringMap = new HashMap&lt;&gt;();<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    stringMap.put("row",<a name="line.337"></a>
+<span class="sourceLineNo">338</span>        Bytes.toStringBinary(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength()));<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    stringMap.put("family", Bytes.toStringBinary(cell.getFamilyArray(), cell.getFamilyOffset(),<a name="line.339"></a>
+<span class="sourceLineNo">340</span>                cell.getFamilyLength()));<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    stringMap.put("qualifier",<a name="line.341"></a>
+<span class="sourceLineNo">342</span>        Bytes.toStringBinary(cell.getQualifierArray(), cell.getQualifierOffset(),<a name="line.342"></a>
+<span class="sourceLineNo">343</span>            cell.getQualifierLength()));<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    stringMap.put("timestamp", cell.getTimestamp());<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    stringMap.put("vlen", cell.getValueLength());<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    if (cell.getTagsLength() &gt; 0) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      List&lt;String&gt; tagsString = new ArrayList&lt;&gt;();<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      Iterator&lt;Tag&gt; tagsIterator = PrivateCellUtil.tagsIterator(cell);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      while (tagsIterator.hasNext()) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        Tag tag = tagsIterator.next();<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        tagsString<a name="line.351"></a>
+<span class="sourceLineNo">352</span>            .add((tag.getType()) + ":" + Bytes.toStringBinary(Tag.cloneValue(tag)));<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      stringMap.put("tag", tagsString);<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    }<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    return stringMap;<a name="line.356"></a>
 <span class="sourceLineNo">357</span>  }<a name="line.357"></a>
 <span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>  /**<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * Pass one or more log file names and formatting options and it will dump out<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * a text version of the contents on &lt;code&gt;stdout&lt;/code&gt;.<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   *<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * @param args<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   *          Command line arguments<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @throws IOException<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   *           Thrown upon file system errors etc.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
-<span class="sourceLineNo">368</span>  public static void run(String[] args) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    // create options<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    Options options = new Options();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    options.addOption("h", "help", false, "Output help message");<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    options.addOption("j", "json", false, "Output JSON");<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    options.addOption("p", "printvals", false, "Print values");<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    options.addOption("r", "region", true,<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        "Region to filter by. Pass encoded region name; e.g. '9192caead6a5a20acb4454ffbc79fa14'");<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    options.addOption("s", "sequence", true,<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        "Sequence to filter by. Pass sequence number.");<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    options.addOption("w", "row", true, "Row to filter by. Pass row name.");<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>    WALPrettyPrinter printer = new WALPrettyPrinter();<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    CommandLineParser parser = new PosixParser();<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    List&lt;?&gt; files = null;<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    try {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      CommandLine cmd = parser.parse(options, args);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      files = cmd.getArgList();<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      if (files.isEmpty() || cmd.hasOption("h")) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        HelpFormatter formatter = new HelpFormatter();<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        formatter.printHelp("WAL &lt;filename...&gt;", options, true);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        System.exit(-1);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      // configure the pretty printer using command line options<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      if (cmd.hasOption("p"))<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        printer.enableValues();<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      if (cmd.hasOption("j"))<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        printer.enableJSON();<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (cmd.hasOption("r"))<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        printer.setRegionFilter(cmd.getOptionValue("r"));<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      if (cmd.hasOption("s"))<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        printer.setSequenceFilter(Long.parseLong(cmd.getOptionValue("s")));<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      if (cmd.hasOption("w"))<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        printer.setRowFilter(cmd.getOptionValue("w"));<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    } catch (ParseException e) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      e.printStackTrace();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      HelpFormatter formatter = new HelpFormatter();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      formatter.printHelp("HFile filename(s) ", options, true);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      System.exit(-1);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    // get configuration, file system, and process the given files<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    Configuration conf = HBaseConfiguration.create();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    FSUtils.setFsDefault(conf, FSUtils.getRootDir(conf));<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>    // begin output<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    printer.beginPersistentOutput();<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    for (Object f : files) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      Path file = new Path((String) f);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      FileSystem fs = file.getFileSystem(conf);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      if (!fs.exists(file)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        System.err.println("ERROR, file doesnt exist: " + file);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>        return;<a name="line.419"></a>
-<span class="sourceLineNo">420</span>      }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      printer.processFile(conf, file);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    printer.endPersistentOutput();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>}<a name="line.425"></a>
+<span class="sourceLineNo">359</span>  public static void main(String[] args) throws IOException {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    run(args);<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>  /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * Pass one or more log file names and formatting options and it will dump out<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * a text version of the contents on &lt;code&gt;stdout&lt;/code&gt;.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   *<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   * @param args<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   *          Command line arguments<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   * @throws IOException<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   *           Thrown upon file system errors etc.<a name="line.370"></a>
+<span class="sourceLineNo">371</span>   */<a name="line.371"></a>
+<span class="sourceLineNo">372</span>  public static void run(String[] args) throws IOException {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    // create options<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    Options options = new Options();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    options.addOption("h", "help", false, "Output help message");<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    options.addOption("j", "json", false, "Output JSON");<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    options.addOption("p", "printvals", false, "Print values");<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    options.addOption("r", "region", true,<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        "Region to filter by. Pass encoded region name; e.g. '9192caead6a5a20acb4454ffbc79fa14'");<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    options.addOption("s", "sequence", true,<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        "Sequence to filter by. Pass sequence number.");<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    options.addOption("w", "row", true, "Row to filter by. Pass row name.");<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>    WALPrettyPrinter printer = new WALPrettyPrinter();<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    CommandLineParser parser = new PosixParser();<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    List&lt;?&gt; files = null;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    try {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      CommandLine cmd = parser.parse(options, args);<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      files = cmd.getArgList();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      if (files.isEmpty() || cmd.hasOption("h")) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        HelpFormatter formatter = new HelpFormatter();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        formatter.printHelp("WAL &lt;filename...&gt;", options, true);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        System.exit(-1);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      // configure the pretty printer using command line options<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      if (cmd.hasOption("p"))<a name="line.396"></a>
+<span class="sourceLineNo">397</span>        printer.enableValues();<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      if (cmd.hasOption("j"))<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        printer.enableJSON();<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      if (cmd.hasOption("r"))<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        printer.setRegionFilter(cmd.getOptionValue("r"));<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      if (cmd.hasOption("s"))<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        printer.setSequenceFilter(Long.parseLong(cmd.getOptionValue("s")));<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      if (cmd.hasOption("w"))<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        printer.setRowFilter(cmd.getOptionValue("w"));<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    } catch (ParseException e) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      HelpFormatter formatter = new HelpFormatter();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      formatter.printHelp("HFile filename(s) ", options, true);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      System.exit(-1);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    }<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    // get configuration, file system, and process the given files<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    Configuration conf = HBaseConfiguration.create();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    FSUtils.setFsDefault(conf, FSUtils.getRootDir(conf));<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>    // begin output<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    printer.beginPersistentOutput();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    for (Object f : files) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      Path file = new Path((String) f);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      FileSystem fs = file.getFileSystem(conf);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>      if (!fs.exists(file)) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>        System.err.println("ERROR, file doesnt exist: " + file);<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        return;<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      printer.processFile(conf, file);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    printer.endPersistentOutput();<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
+<span class="sourceLineNo">429</span>}<a name="line.429"></a>
 
 
 


[42/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/checkstyle.rss
----------------------------------------------------------------------
diff --git a/checkstyle.rss b/checkstyle.rss
index 5137342..a4394b1 100644
--- a/checkstyle.rss
+++ b/checkstyle.rss
@@ -26,7 +26,7 @@ under the License.
     <copyright>&#169;2007 - 2018 The Apache Software Foundation</copyright>
     <item>
       <title>File: 3703,
-             Errors: 15559,
+             Errors: 15546,
              Warnings: 0,
              Infos: 0
       </title>
@@ -10919,7 +10919,7 @@ under the License.
                   0
                 </td>
                 <td>
-                  7
+                  5
                 </td>
               </tr>
                           <tr>
@@ -31891,7 +31891,7 @@ under the License.
                   0
                 </td>
                 <td>
-                  7
+                  5
                 </td>
               </tr>
                           <tr>
@@ -37883,7 +37883,7 @@ under the License.
                   0
                 </td>
                 <td>
-                  250
+                  242
                 </td>
               </tr>
                           <tr>
@@ -49629,7 +49629,7 @@ under the License.
                   0
                 </td>
                 <td>
-                  41
+                  40
                 </td>
               </tr>
                           <tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index 0a56ebd..5054798 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Code of Conduct Policy
@@ -375,7 +375,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index 2052dc8..7ca1c08 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Dependencies</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -440,7 +440,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index b83d6fc..e8d4621 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Reactor Dependency Convergence</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -890,7 +890,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 618decf..6955512 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Dependency Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -313,7 +313,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index 1061be4..de794f8 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Dependency Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -1005,7 +1005,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index d2ec4af..5b1f980 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -3817,21 +3817,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/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/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Wed Aug 15 14:39:17 UTC 2018"</code></td>
+<td class="colLast"><code>"Thu Aug 16 14:38:56 UTC 2018"</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/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/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"1114a1a65e78a00f643ef15b9a13bc710cb80845"</code></td>
+<td class="colLast"><code>"092efb42749bf7fc6ad338c96aae8e7b9d3a2c74"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/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/Version.html#srcChecksum">srcChecksum</a></code></td>
-<td class="colLast"><code>"b03e26b326c47068ee3c2d38b4181ca8"</code></td>
+<td class="colLast"><code>"ea011180320b95ba2577dbbea3f2ed3d"</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.url">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 50c58f5..e3af1fc 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -47447,7 +47447,7 @@
 <dd>
 <div class="block">Get the regions to be reopened when modifying a table.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath(WAL.Entry, String, Configuration)</a></span> - Static method in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/WALSplitter.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath(WAL.Entry, String, String, Configuration)</a></span> - Static method in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/WALSplitter.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter</a></dt>
 <dd>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
  <code>logEntry</code> named for the sequenceid in the passed
@@ -68548,6 +68548,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapred/TableInputFormatBase.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapred.<a href="org/apache/hadoop/hbase/mapred/TableInputFormatBase.html" title="class in org.apache.hadoop.hbase.mapred">TableInputFormatBase</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapred.<a href="org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html" title="class in org.apache.hadoop.hbase.mapred">TableMapReduceUtil</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapred.<a href="org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html" title="class in org.apache.hadoop.hbase.mapred">TableRecordReaderImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/CellCounter.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/CellCounter.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCounter</a></dt>
@@ -68598,6 +68600,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/RowCounter.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/RowCounter.html" title="class in org.apache.hadoop.hbase.mapreduce">RowCounter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/SampleUploader.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/SampleUploader.html" title="class in org.apache.hadoop.hbase.mapreduce">SampleUploader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html" title="class in org.apache.hadoop.hbase.mapreduce">SimpleTotalOrderPartitioner</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/SyncTable.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/SyncTable.html" title="class in org.apache.hadoop.hbase.mapreduce">SyncTable</a></dt>
@@ -68620,6 +68624,10 @@
 <div class="block"><span class="deprecationComment">LOG variable would be made private. fix in hbase 3.0</span></div>
 </div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#LOG">LOG</a></span> - Static 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>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html" title="class in org.apache.hadoop.hbase.mapreduce">TsvImporterTextMapper</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/WALInputFormat.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/WALInputFormat.html" title="class in org.apache.hadoop.hbase.mapreduce">WALInputFormat</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/mapreduce/WALPlayer.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="org/apache/hadoop/hbase/mapreduce/WALPlayer.html" title="class in org.apache.hadoop.hbase.mapreduce">WALPlayer</a></dt>
@@ -68892,6 +68900,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.procedure2.store.wal.<a href="org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.html" title="class in org.apache.hadoop.hbase.procedure2.store.wal">ProcedureWALFormatReader</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.procedure2.store.wal.<a href="org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html" title="class in org.apache.hadoop.hbase.procedure2.store.wal">ProcedureWALPrettyPrinter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.procedure2.store.wal.<a href="org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html" title="class in org.apache.hadoop.hbase.procedure2.store.wal">WALProcedureStore</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.procedure2.<a href="org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.html" title="class in org.apache.hadoop.hbase.procedure2">TimeoutExecutorThread</a></dt>
@@ -69372,10 +69382,14 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/CallQueue.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/CallQueue.html" title="class in org.apache.hadoop.hbase.thrift">CallQueue</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/DemoClient.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/DemoClient.html" title="class in org.apache.hadoop.hbase.thrift">DemoClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.html" title="class in org.apache.hadoop.hbase.thrift">HbaseHandlerMetricsProxy</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.html" title="class in org.apache.hadoop.hbase.thrift">HThreadedSelectorServerArgs</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/HttpDoAsClient.html" title="class in org.apache.hadoop.hbase.thrift">HttpDoAsClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/IncrementCoalescer.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/IncrementCoalescer.html" title="class in org.apache.hadoop.hbase.thrift">IncrementCoalescer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/TBoundedThreadPoolServer.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/TBoundedThreadPoolServer.html" title="class in org.apache.hadoop.hbase.thrift">TBoundedThreadPoolServer</a></dt>
@@ -69524,6 +69538,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/WALFactory.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/WALFactory.html" title="class in org.apache.hadoop.hbase.wal">WALFactory</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/WALPrettyPrinter.html" title="class in org.apache.hadoop.hbase.wal">WALPrettyPrinter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/WALSplitter.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/WALSplitter.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ZKNamespaceManager.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/ZKNamespaceManager.html" title="class in org.apache.hadoop.hbase">ZKNamespaceManager</a></dt>
@@ -69534,6 +69550,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/zookeeper/DeletionListener.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.zookeeper.<a href="org/apache/hadoop/hbase/zookeeper/DeletionListener.html" title="class in org.apache.hadoop.hbase.zookeeper">DeletionListener</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.zookeeper.<a href="org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html" title="class in org.apache.hadoop.hbase.zookeeper">HQuorumPeer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.zookeeper.<a href="org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html" title="class in org.apache.hadoop.hbase.zookeeper">LoadBalancerTracker</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.zookeeper.<a href="org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html" title="class in org.apache.hadoop.hbase.zookeeper">MetaTableLocator</a></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html b/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
index fccd96e..1676971 100644
--- a/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -800,7 +800,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaster</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.311">getMaster</a>(int&nbsp;serverNumber)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.312">getMaster</a>(int&nbsp;serverNumber)</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>the HMaster thread</dd>
@@ -813,7 +813,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getActiveMaster</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.320">getActiveMaster</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.321">getActiveMaster</a>()</pre>
 <div class="block">Gets the current active master, if available.  If no active master, returns
  null.</div>
 <dl>
@@ -828,7 +828,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getMasters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.334">getMasters</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.335">getMasters</a>()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>Read-only list of master threads.</dd>
@@ -841,7 +841,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getLiveMasters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.343">getLiveMasters</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.344">getLiveMasters</a>()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>List of running master servers (Some servers may have been killed
@@ -856,7 +856,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnMaster</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.358">waitOnMaster</a>(int&nbsp;serverNumber)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.359">waitOnMaster</a>(int&nbsp;serverNumber)</pre>
 <div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -870,7 +870,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnMaster</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.367">waitOnMaster</a>(<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>&nbsp;masterThread)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.368">waitOnMaster</a>(<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>&nbsp;masterThread)</pre>
 <div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -884,7 +884,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>join</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.384">join</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.387">join</a>()</pre>
 <div class="block">Wait for Mini HBase Cluster to shut down.
  Presumes you've already called <a href="../../../../org/apache/hadoop/hbase/LocalHBaseCluster.html#shutdown--"><code>shutdown()</code></a>.</div>
 </li>
@@ -895,7 +895,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>startup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.412">startup</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.415">startup</a>()
              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Start the cluster.</div>
 <dl>
@@ -910,7 +910,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.419">shutdown</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.422">shutdown</a>()</pre>
 <div class="block">Shut down the mini HBase cluster</div>
 </li>
 </ul>
@@ -920,7 +920,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isLocal</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.427">isLocal</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.430">isLocal</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>c</code> - Configuration to check.</dd>
@@ -935,7 +935,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.437">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.440">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Test things basically work.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 38f7cc7..a6b88dd 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -167,9 +167,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html b/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
index 49ffafb..cffd436 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html#line.168">ClientAsyncPrefetchScanner.PrefetchRunnable</a>
+<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html#line.167">ClientAsyncPrefetchScanner.PrefetchRunnable</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></pre>
 </li>
@@ -189,7 +189,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PrefetchRunnable</h4>
-<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html#line.168">PrefetchRunnable</a>()</pre>
+<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html#line.167">PrefetchRunnable</a>()</pre>
 </li>
 </ul>
 </li>
@@ -206,7 +206,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html#line.171">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html#line.170">run</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html b/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
index 813aa90..4635c90 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
@@ -574,7 +574,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/ClientSimpleScann
 <ul class="blockList">
 <li class="blockList">
 <h4>prefetchCondition</h4>
-<pre>private&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html#line.157">prefetchCondition</a>()</pre>
+<pre>private&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html#line.156">prefetchCondition</a>()</pre>
 </li>
 </ul>
 <a name="pollCache--">
@@ -583,7 +583,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/ClientSimpleScann
 <ul class="blockListLast">
 <li class="blockList">
 <h4>pollCache</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html#line.161">pollCache</a>()</pre>
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html#line.160">pollCache</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html b/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
index 8c1381b..9eec050 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
@@ -498,7 +498,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addCallsForReplica</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html#line.310">addCallsForReplica</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultBoundedCompletionService.html" title="class in org.apache.hadoop.hbase.client">ResultBoundedCompletionService</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&gt;&nbsp;cs,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html#line.309">addCallsForReplica</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultBoundedCompletionService.html" title="class in org.apache.hadoop.hbase.client">ResultBoundedCompletionService</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&gt;&nbsp;cs,
                                 <a href="../../../../../org/apache/hadoop/hbase/RegionLocations.html" title="class in org.apache.hadoop.hbase">RegionLocations</a>&nbsp;rl,
                                 int&nbsp;min,
                                 int&nbsp;max)</pre>
@@ -518,7 +518,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getRegionLocations</h4>
-<pre>static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/RegionLocations.html" title="class in org.apache.hadoop.hbase">RegionLocations</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html#line.319">getRegionLocations</a>(boolean&nbsp;useCache,
+<pre>static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/RegionLocations.html" title="class in org.apache.hadoop.hbase">RegionLocations</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html#line.318">getRegionLocations</a>(boolean&nbsp;useCache,
                                           int&nbsp;replicaId,
                                           <a href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">ClusterConnection</a>&nbsp;cConnection,
                                           <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 1255e0b..ead79f5 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -552,24 +552,24 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
index e67b778..329f62f 100644
--- a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
@@ -201,8 +201,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.MetaTableOps.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">MetaTableMetrics.MetaTableOps</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.MutationType.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">RegionObserver.MutationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.MetaTableOps.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">MetaTableMetrics.MetaTableOps</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/ParseFilter.html b/devapidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
index 6c27da2..942fa92 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
@@ -525,7 +525,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getFilterName</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.276">getFilterName</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.277">getFilterName</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
 <div class="block">Returns the filter name given a simple filter expression
  <p></div>
 <dl>
@@ -542,7 +542,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getFilterArguments</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a>&lt;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.304">getFilterArguments</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a>&lt;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.305">getFilterArguments</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
 <div class="block">Returns the arguments of the filter from the filter string
  <p></div>
 <dl>
@@ -559,7 +559,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>reduce</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.374">reduce</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.375">reduce</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
                    <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&gt;&nbsp;filterStack,
                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;operator)</pre>
 <div class="block">This function is called while parsing the filterString and an operator is parsed
@@ -578,7 +578,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>popArguments</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.392">popArguments</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.393">popArguments</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&gt;&nbsp;filterStack)</pre>
 <div class="block">Pops an argument from the operator stack and the number of arguments required by the operator
  from the filterStack and evaluates them
@@ -598,7 +598,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>hasHigherPriority</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.472">hasHigherPriority</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;a,
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.473">hasHigherPriority</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;a,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;b)</pre>
 <div class="block">Returns which operator has higher precedence
  <p>
@@ -612,7 +612,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createUnescapdArgument</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.487">createUnescapdArgument</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.488">createUnescapdArgument</a>(byte[]&nbsp;filterStringAsByteArray,
                                             int&nbsp;argumentStartIndex,
                                             int&nbsp;argumentEndIndex)</pre>
 <div class="block">Removes the single quote escaping a single quote - thus it returns an unescaped argument
@@ -633,7 +633,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForOr</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.525">checkForOr</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.526">checkForOr</a>(byte[]&nbsp;filterStringAsByteArray,
                                  int&nbsp;indexOfOr)
                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a>,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ArrayIndexOutOfBoundsException.html?is-external=true" title="class or interface in java.lang">ArrayIndexOutOfBoundsException</a></pre>
@@ -657,7 +657,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForAnd</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.551">checkForAnd</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.552">checkForAnd</a>(byte[]&nbsp;filterStringAsByteArray,
                                   int&nbsp;indexOfAnd)
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a></pre>
 <div class="block">Checks if the current index of filter string we are on is the beginning of the keyword 'AND'
@@ -679,7 +679,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForSkip</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.578">checkForSkip</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.579">checkForSkip</a>(byte[]&nbsp;filterStringAsByteArray,
                                    int&nbsp;indexOfSkip)
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a></pre>
 <div class="block">Checks if the current index of filter string we are on is the beginning of the keyword 'SKIP'
@@ -701,7 +701,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForWhile</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.608">checkForWhile</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.609">checkForWhile</a>(byte[]&nbsp;filterStringAsByteArray,
                                     int&nbsp;indexOfWhile)
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a></pre>
 <div class="block">Checks if the current index of filter string we are on is the beginning of the keyword 'WHILE'
@@ -723,7 +723,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isQuoteUnescaped</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.638">isQuoteUnescaped</a>(byte[]&nbsp;array,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.639">isQuoteUnescaped</a>(byte[]&nbsp;array,
                                        int&nbsp;quoteIndex)</pre>
 <div class="block">Returns a boolean indicating whether the quote was escaped or not
  <p></div>
@@ -742,7 +742,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>removeQuotesFromByteArray</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.659">removeQuotesFromByteArray</a>(byte[]&nbsp;quotedByteArray)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.660">removeQuotesFromByteArray</a>(byte[]&nbsp;quotedByteArray)</pre>
 <div class="block">Takes a quoted byte array and converts it into an unquoted byte array
  For example: given a byte array representing 'abc', it returns a
  byte array representing abc
@@ -761,7 +761,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>convertByteArrayToInt</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.681">convertByteArrayToInt</a>(byte[]&nbsp;numberAsByteArray)</pre>
+<pre>public static&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.682">convertByteArrayToInt</a>(byte[]&nbsp;numberAsByteArray)</pre>
 <div class="block">Converts an int expressed in a byte array to an actual int
  <p>
  This doesn't use Bytes.toInt because that assumes
@@ -781,7 +781,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>convertByteArrayToLong</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.704">convertByteArrayToLong</a>(byte[]&nbsp;numberAsByteArray)</pre>
+<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.705">convertByteArrayToLong</a>(byte[]&nbsp;numberAsByteArray)</pre>
 <div class="block">Converts a long expressed in a byte array to an actual long
  <p>
  This doesn't use Bytes.toLong because that assumes
@@ -801,7 +801,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>convertByteArrayToBoolean</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.747">convertByteArrayToBoolean</a>(byte[]&nbsp;booleanAsByteArray)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.748">convertByteArrayToBoolean</a>(byte[]&nbsp;booleanAsByteArray)</pre>
 <div class="block">Converts a boolean expressed in a byte array to an actual boolean
 <p>
  This doesn't used Bytes.toBoolean because Bytes.toBoolean(byte [])
@@ -822,7 +822,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createCompareOperator</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase">CompareOperator</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.777">createCompareOperator</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase">CompareOperator</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.778">createCompareOperator</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
 <div class="block">Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -839,7 +839,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <li class="blockList">
 <h4>createCompareOp</h4>
 <pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter">CompareFilter.CompareOp</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.804">createCompareOp</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
+public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter">CompareFilter.CompareOp</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.805">createCompareOp</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Since 2.0
  <p></span></div>
 <div class="block">Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator</div>
@@ -857,7 +857,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>createComparator</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/ByteArrayComparable.html" title="class in org.apache.hadoop.hbase.filter">ByteArrayComparable</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.828">createComparator</a>(byte[]&nbsp;comparator)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/ByteArrayComparable.html" title="class in org.apache.hadoop.hbase.filter">ByteArrayComparable</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.829">createComparator</a>(byte[]&nbsp;comparator)</pre>
 <div class="block">Parses a comparator of the form comparatorType:comparatorValue form and returns a comparator
  <p></div>
 <dl>
@@ -874,7 +874,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>parseComparator</h4>
-<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.854">parseComparator</a>(byte[]&nbsp;comparator)</pre>
+<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.855">parseComparator</a>(byte[]&nbsp;comparator)</pre>
 <div class="block">Splits a column in comparatorType:comparatorValue form into separate byte arrays
  <p></div>
 <dl>
@@ -891,7 +891,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>getSupportedFilters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.875">getSupportedFilters</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.876">getSupportedFilters</a>()</pre>
 <div class="block">Return a Set of filters supported by the Filter Language</div>
 </li>
 </ul>
@@ -901,7 +901,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>getAllFilters</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.883">getAllFilters</a>()</pre>
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.884">getAllFilters</a>()</pre>
 <div class="block">Returns all known filters</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -915,7 +915,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockListLast">
 <li class="blockList">
 <h4>registerFilter</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.894">registerFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.895">registerFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;filterClass)</pre>
 <div class="block">Register a new filter with the parser.  If the filter is already registered,
  an IllegalArgumentException will be thrown.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index 7e5f48f..099d04c 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -183,14 +183,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">CompareFilter.CompareOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 8e30386..3fe3b39 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -274,12 +274,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType.BlockCategory</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index 427b9f5..b08012e 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -353,9 +353,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
 </ul>
 </li>
 </ul>


[06/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterThread.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterThread.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[46/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
index 39170f0..7859ebc 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.append(sourceCf + ":" + destCf);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
+<span class

<TRUNCATED>

[43/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index cdd3551..8b77c1f 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Checkstyle Results</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.4-HBase.min.css" />
@@ -284,7 +284,7 @@
 <td>3703</td>
 <td>0</td>
 <td>0</td>
-<td>15559</td></tr></table></div>
+<td>15546</td></tr></table></div>
 <div class="section">
 <h2><a name="Files"></a>Files</h2>
 <table border="0" class="table table-striped">
@@ -4517,12 +4517,12 @@
 <td><a href="#org.apache.hadoop.hbase.mapreduce.TsvImporterMapper.java">org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.java</a></td>
 <td>0</td>
 <td>0</td>
-<td>7</td></tr>
+<td>5</td></tr>
 <tr class="a">
 <td><a href="#org.apache.hadoop.hbase.mapreduce.TsvImporterTextMapper.java">org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.java</a></td>
 <td>0</td>
 <td>0</td>
-<td>7</td></tr>
+<td>5</td></tr>
 <tr class="b">
 <td><a href="#org.apache.hadoop.hbase.mapreduce.VisibilityExpressionResolver.java">org/apache/hadoop/hbase/mapreduce/VisibilityExpressionResolver.java</a></td>
 <td>0</td>
@@ -8797,7 +8797,7 @@
 <td><a href="#org.apache.hadoop.hbase.thrift.DemoClient.java">org/apache/hadoop/hbase/thrift/DemoClient.java</a></td>
 <td>0</td>
 <td>0</td>
-<td>250</td></tr>
+<td>242</td></tr>
 <tr class="a">
 <td><a href="#org.apache.hadoop.hbase.thrift.HttpDoAsClient.java">org/apache/hadoop/hbase/thrift/HttpDoAsClient.java</a></td>
 <td>0</td>
@@ -9742,7 +9742,7 @@
 <td><a href="#org.apache.hadoop.hbase.wal.WALSplitter.java">org/apache/hadoop/hbase/wal/WALSplitter.java</a></td>
 <td>0</td>
 <td>0</td>
-<td>41</td></tr>
+<td>40</td></tr>
 <tr class="b">
 <td><a href="#org.apache.hadoop.hbase.zookeeper.ReadOnlyZKClient.java">org/apache/hadoop/hbase/zookeeper/ReadOnlyZKClient.java</a></td>
 <td>0</td>
@@ -9789,7 +9789,7 @@
 <tr class="b">
 <td></td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_blocks.html#LeftCurly">LeftCurly</a></td>
-<td>194</td>
+<td>192</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="a">
 <td></td>
@@ -9876,19 +9876,19 @@
 <li>caseIndent: <tt>&quot;2&quot;</tt></li>
 <li>basicOffset: <tt>&quot;2&quot;</tt></li>
 <li>lineWrappingIndentation: <tt>&quot;2&quot;</tt></li></ul></td>
-<td>4965</td>
+<td>4954</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="a">
 <td>javadoc</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
 <ul>
 <li>offset: <tt>&quot;2&quot;</tt></li></ul></td>
-<td>770</td>
+<td>771</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="b">
 <td></td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3619</td>
+<td>3618</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="a">
 <td>misc</td>
@@ -16025,31 +16025,31 @@
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>340</td></tr>
+<td>341</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>341</td></tr>
+<td>342</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
-<td>428</td></tr>
+<td>431</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>434</td></tr>
+<td>437</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>435</td></tr></table></div>
+<td>438</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.MetaMockingUtil.java">org/apache/hadoop/hbase/MetaMockingUtil.java</h3>
 <table border="0" class="table table-striped">
@@ -19524,7 +19524,7 @@
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
 <td>Javadoc comment at column 0 has parse error. Details: no viable alternative at input '   *' while parsing JAVADOC_TAG</td>
 <td>117</td></tr>
 <tr class="a">
@@ -40103,241 +40103,241 @@
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>276</td></tr>
+<td>277</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>304</td></tr>
+<td>305</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>392</td></tr>
+<td>393</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>487</td></tr>
+<td>488</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>525</td></tr>
+<td>526</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>551</td></tr>
+<td>552</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>578</td></tr>
+<td>579</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>608</td></tr>
+<td>609</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>638</td></tr>
+<td>639</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>659</td></tr>
+<td>660</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>681</td></tr>
+<td>682</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>704</td></tr>
+<td>705</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>747</td></tr>
+<td>748</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>777</td></tr>
+<td>778</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>779</td></tr>
+<td>780</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>781</td></tr>
+<td>782</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>783</td></tr>
+<td>784</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>785</td></tr>
+<td>786</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>787</td></tr>
+<td>788</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>789</td></tr>
+<td>790</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
-<td>791</td></tr>
+<td>792</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>annotation</td>
 <td>MissingDeprecated</td>
 <td>Duplicate @deprecated tag.</td>
-<td>801</td></tr>
+<td>802</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>804</td></tr>
+<td>805</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>806</td></tr>
+<td>807</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>808</td></tr>
+<td>809</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>810</td></tr>
+<td>811</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>812</td></tr>
+<td>813</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>814</td></tr>
+<td>815</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>816</td></tr>
+<td>817</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
-<td>818</td></tr>
+<td>819</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>828</td></tr>
+<td>829</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>829</td></tr>
+<td>830</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>836</td></tr>
+<td>837</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>838</td></tr>
+<td>839</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>840</td></tr>
+<td>841</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>842</td></tr>
+<td>843</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'else' construct must use '{}'s.</td>
-<td>844</td></tr>
+<td>845</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>854</td></tr>
+<td>855</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>whitespace</td>
 <td>MethodParamPad</td>
 <td>'(' is preceded with whitespace.</td>
-<td>875</td></tr>
+<td>876</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>895</td></tr></table></div>
+<td>896</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.filter.PrefixFilter.java">org/apache/hadoop/hbase/filter/PrefixFilter.java</h3>
 <table border="0" class="table table-striped">
@@ -54476,127 +54476,127 @@
 <td>imports</td>
 <td>ImportOrder</td>
 <td>Wrong order for 'java.io.IOException' import.</td>
-<td>44</td></tr>
+<td>46</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>design</td>
 <td>HideUtilityClassConstructor</td>
 <td>Utility classes should not have a public or default constructor.</td>
-<td>51</td></tr>
+<td>53</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>168</td></tr>
+<td>171</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>172</td></tr>
+<td>175</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>173</td></tr>
+<td>176</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>182</td></tr>
+<td>185</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>199</td></tr>
+<td>202</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>203</td></tr>
+<td>206</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>204</td></tr>
+<td>207</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>237</td></tr>
+<td>240</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>249</td></tr>
+<td>252</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>254</td></tr>
+<td>257</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>266</td></tr>
+<td>269</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>331</td></tr>
+<td>334</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>334</td></tr>
+<td>337</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>348</td></tr>
+<td>351</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>351</td></tr>
+<td>354</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>364</td></tr>
+<td>367</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>378</td></tr>
+<td>381</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>390</td></tr>
+<td>393</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 113).</td>
-<td>397</td></tr></table></div>
+<td>400</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapred.TableOutputFormat.java">org/apache/hadoop/hbase/mapred/TableOutputFormat.java</h3>
 <table border="0" class="table table-striped">
@@ -55325,25 +55325,25 @@
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 4, expected level should be 6.</td>
-<td>190</td></tr>
+<td>191</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>misc</td>
 <td>ArrayTypeStyle</td>
 <td>Array brackets at illegal position.</td>
-<td>247</td></tr>
+<td>248</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>259</td></tr>
+<td>260</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>285</td></tr></table></div>
+<td>286</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapreduce.CellCreator.java">org/apache/hadoop/hbase/mapreduce/CellCreator.java</h3>
 <table border="0" class="table table-striped">
@@ -55979,61 +55979,61 @@
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 4, expected level should be 6.</td>
-<td>272</td></tr>
+<td>273</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>284</td></tr>
+<td>285</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 4, expected level should be 6.</td>
-<td>318</td></tr>
+<td>320</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 4, expected level should be 6.</td>
-<td>327</td></tr>
+<td>330</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>346</td></tr>
+<td>349</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>426</td></tr>
+<td>429</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 12, expected level should be 10.</td>
-<td>539</td></tr>
+<td>542</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 12, expected level should be 10.</td>
-<td>543</td></tr>
+<td>546</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>JavadocTagContinuationIndentation</td>
 <td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>561</td></tr>
+<td>564</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>605</td></tr></table></div>
+<td>608</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapreduce.ImportTsv.java">org/apache/hadoop/hbase/mapreduce/ImportTsv.java</h3>
 <table border="0" class="table table-striped">
@@ -56843,19 +56843,19 @@
 <td>indentation</td>
 <td>Indentation</td>
 <td>'extends' has incorrect indentation level 2, expected level should be 4.</td>
-<td>67</td></tr>
+<td>70</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 4, expected level should be 6.</td>
-<td>74</td></tr>
+<td>77</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>117</td></tr></table></div>
+<td>121</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapreduce.SimpleTotalOrderPartitioner.java">org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.java</h3>
 <table border="0" class="table table-striped">
@@ -60425,40 +60425,28 @@
 <td>32</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'extends' has incorrect indentation level 0, expected level should be 2.</td>
-<td>48</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>blocks</td>
-<td>LeftCurly</td>
-<td>'{' at column 1 should be on the previous line.</td>
-<td>49</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>101</td></tr>
+<td>103</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>119</td></tr>
+<td>121</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'throws' has incorrect indentation level 2, expected level should be 4.</td>
-<td>151</td></tr>
+<td>153</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
-<td>182</td></tr></table></div>
+<td>184</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">
@@ -60488,28 +60476,16 @@
 <td>30</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'extends' has incorrect indentation level 0, expected level should be 2.</td>
-<td>37</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>blocks</td>
-<td>LeftCurly</td>
-<td>'{' at column 1 should be on the previous line.</td>
-<td>38</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>68</td></tr>
+<td>70</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td>84</td></tr></table></div>
+<td>86</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapreduce.VisibilityExpressionResolver.java">org/apache/hadoop/hbase/mapreduce/VisibilityExpressionResolver.java</h3>
 <table border="0" class="table table-striped">
@@ -60614,13 +60590,13 @@
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
-<td>224</td></tr>
+<td>226</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
-<td>360</td></tr></table></div>
+<td>362</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication.java">org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java</h3>
 <table border="0" class="table table-striped">
@@ -74231,13 +74207,13 @@
 <td>imports</td>
 <td>ImportOrder</td>
 <td>Wrong order for 'org.apache.hadoop.hbase.procedure2.Procedure' import.</td>
-<td>35</td></tr>
+<td>37</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>imports</td>
 <td>ImportOrder</td>
 <td>Wrong order for 'org.apache.hadoop.util.Tool' import.</td>
-<td>39</td></tr></table></div>
+<td>41</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.procedure2.store.wal.TestStressWALProcedureStore.java">org/apache/hadoop/hbase/procedure2/store/wal/TestStressWALProcedureStore.java</h3>
 <table border="0" class="table table-striped">
@@ -106916,1501 +106892,1453 @@
 <td>indentation</td>
 <td>Indentation</td>
 <td>'member def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>58</td></tr>
+<td>61</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'member def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>59</td></tr>
+<td>62</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'member def type' has incorrect indentation level 4, expected level should be 2.</td>
-<td>60</td></tr>
+<td>63</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'member def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>62</td></tr>
+<td>65</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'member def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>63</td></tr>
+<td>66</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>65</td></tr>
+<td>68</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 8, expected level should be 4.</td>
-<td>67</td></tr>
+<td>70</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>69</td></tr>
+<td>72</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>70</td></tr>
+<td>73</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 103).</td>
-<td>70</td></tr>
+<td>73</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>72</td></tr>
+<td>75</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>73</td></tr>
+<td>76</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>75</td></tr>
+<td>78</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>76</td></tr>
+<td>79</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 8, expected level should be 4.</td>
-<td>77</td></tr>
+<td>80</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 6.</td>
-<td>78</td></tr>
+<td>81</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>79</td></tr>
+<td>82</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 8, expected level should be 4.</td>
-<td>81</td></tr>
+<td>84</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 6.</td>
-<td>82</td></tr>
+<td>85</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>83</td></tr>
+<td>86</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>85</td></tr>
+<td>88</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>86</td></tr>
+<td>89</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>94</td></tr>
+<td>97</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>96</td></tr>
+<td>99</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 6, expected level should be 4.</td>
-<td>97</td></tr>
+<td>100</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 105).</td>
-<td>97</td></tr>
+<td>100</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>98</td></tr>
+<td>101</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'ctor def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>100</td></tr>
+<td>103</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'ctor def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>101</td></tr>
+<td>104</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'ctor def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>102</td></tr>
+<td>105</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>105</td></tr>
+<td>108</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' has incorrect indentation level 8, expected level should be 4.</td>
-<td>106</td></tr>
+<td>109</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>107</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'try rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>108</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'catch' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>109</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'catch rcurly' has incorrect indentation level 8, expected level should be 4.</td>
 <td>110</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>111</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
-<td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>114</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'try' has incorrect indentation level 8, expected level should be 4.</td>
-<td>115</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'try' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>116</td></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
 <td>'try rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>117</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>indentation</td>
-<td>Indentation</td>
-<td>'catch' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>118</td></tr>
+<td>111</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'catch' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>119</td></tr>
+<td>112</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'catch rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>120</td></tr>
+<td>113</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>121</td></tr>
+<td>114</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>123</td></tr>
+<td>126</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>MethodLength</td>
 <td>Method length is 223 lines (max allowed is 150).</td>
-<td>123</td></tr>
+<td>126</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>124</td></tr>
+<td>127</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 8, expected level should be 4.</td>
-<td>125</td></tr>
+<td>128</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 6.</td>
-<td>126</td></tr>
+<td>129</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 6.</td>
-<td>127</td></tr>
+<td>130</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 10, expected level should be 6.</td>
-<td>134</td></tr>
+<td>137</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>138</td></tr>
+<td>141</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>140</td></tr>
+<td>143</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>142</td></tr>
+<td>145</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>143</td></tr>
+<td>146</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>145</td></tr>
+<td>148</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>150</td></tr>
+<td>153</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>151</td></tr>
+<td>154</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>152</td></tr>
+<td>155</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 12, expected level should be 6.</td>
-<td>153</td></tr>
+<td>156</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 16, expected level should be 8.</td>
-<td>154</td></tr>
+<td>157</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 20, expected level should be 10.</td>
-<td>155</td></tr>
+<td>158</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 20, expected level should be 10.</td>
-<td>156</td></tr>
+<td>159</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 16, expected level should be 8.</td>
-<td>157</td></tr>
+<td>160</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>158</td></tr>
+<td>161</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>159</td></tr>
+<td>162</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>160</td></tr>
+<td>163</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>161</td></tr>
+<td>164</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>166</td></tr>
+<td>169</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>167</td></tr>
+<td>170</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>168</td></tr>
+<td>171</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>169</td></tr>
+<td>172</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>170</td></tr>
+<td>173</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>171</td></tr>
+<td>174</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>172</td></tr>
+<td>175</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>173</td></tr>
+<td>176</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>174</td></tr>
+<td>177</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>175</td></tr>
+<td>178</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>176</td></tr>
+<td>179</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>178</td></tr>
+<td>181</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' has incorrect indentation level 8, expected level should be 4.</td>
-<td>179</td></tr>
+<td>182</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>180</td></tr>
+<td>183</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>181</td></tr>
+<td>184</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'catch' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>182</td></tr>
+<td>185</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'catch rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>183</td></tr>
+<td>186</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>185</td></tr>
+<td>188</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>186</td></tr>
+<td>189</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 102).</td>
-<td>186</td></tr>
+<td>189</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>187</td></tr>
+<td>190</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>188</td></tr>
+<td>191</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 123).</td>
-<td>188</td></tr>
+<td>191</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>189</td></tr>
+<td>192</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>191</td></tr>
+<td>194</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>192</td></tr>
+<td>195</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>197</td></tr>
+<td>200</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'array initialization' child has incorrect indentation level 12, expected level should be one of the following: 10, 26, 27.</td>
-<td>198</td></tr>
+<td>201</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>199</td></tr>
+<td>202</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'array initialization' child has incorrect indentation level 12, expected level should be one of the following: 10, 24, 25.</td>
-<td>200</td></tr>
+<td>203</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'array initialization' child has incorrect indentation level 12, expected level should be one of the following: 10, 24, 25.</td>
-<td>201</td></tr>
+<td>204</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'array initialization' child has incorrect indentation level 12, expected level should be one of the following: 10, 24, 25.</td>
-<td>202</td></tr>
+<td>205</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>204</td></tr>
+<td>207</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>206</td></tr>
+<td>209</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>207</td></tr>
+<td>210</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>209</td></tr>
+<td>212</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>214</td></tr>
+<td>217</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>215</td></tr>
+<td>218</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 116).</td>
-<td>215</td></tr>
+<td>218</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>216</td></tr>
+<td>219</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>220</td></tr>
+<td>223</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>221</td></tr>
+<td>224</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 118).</td>
-<td>221</td></tr>
+<td>224</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>222</td></tr>
+<td>225</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>226</td></tr>
+<td>229</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>227</td></tr>
+<td>230</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>229</td></tr>
+<td>232</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>230</td></tr>
+<td>233</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 119).</td>
-<td>230</td></tr>
+<td>233</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while' has incorrect indentation level 8, expected level should be 4.</td>
-<td>232</td></tr>
+<td>235</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>233</td></tr>
+<td>236</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 12, expected level should be 6.</td>
-<td>234</td></tr>
+<td>237</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>235</td></tr>
+<td>238</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>236</td></tr>
+<td>239</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>237</td></tr>
+<td>240</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>238</td></tr>
+<td>241</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>243</td></tr>
+<td>246</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>245</td></tr>
+<td>248</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>246</td></tr>
+<td>249</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>247</td></tr>
+<td>250</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>248</td></tr>
+<td>251</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>250</td></tr>
+<td>253</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>251</td></tr>
+<td>254</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 131).</td>
-<td>251</td></tr>
+<td>254</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>252</td></tr>
+<td>255</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>253</td></tr>
+<td>256</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>254</td></tr>
+<td>257</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' has incorrect indentation level 12, expected level should be 6.</td>
-<td>257</td></tr>
+<td>260</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>258</td></tr>
+<td>261</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>259</td></tr>
+<td>262</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'catch rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>261</td></tr>
+<td>264</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>263</td></tr>
+<td>266</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>264</td></tr>
+<td>267</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 125).</td>
-<td>264</td></tr>
+<td>267</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>265</td></tr>
+<td>268</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 127).</td>
-<td>265</td></tr>
+<td>268</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>266</td></tr>
+<td>269</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>267</td></tr>
+<td>270</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>269</td></tr>
+<td>272</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>270</td></tr>
+<td>273</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>271</td></tr>
+<td>274</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>272</td></tr>
+<td>275</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>273</td></tr>
+<td>276</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>274</td></tr>
+<td>277</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>275</td></tr>
+<td>278</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>276</td></tr>
+<td>279</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>277</td></tr>
+<td>280</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>278</td></tr>
+<td>281</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>279</td></tr>
+<td>282</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>280</td></tr>
+<td>283</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>282</td></tr>
+<td>285</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>283</td></tr>
+<td>286</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 141).</td>
-<td>283</td></tr>
+<td>286</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>284</td></tr>
+<td>287</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 145).</td>
-<td>284</td></tr>
+<td>287</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>285</td></tr>
+<td>288</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>286</td></tr>
+<td>289</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' has incorrect indentation level 12, expected level should be 6.</td>
-<td>289</td></tr>
+<td>292</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>290</td></tr>
+<td>293</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'try rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>291</td></tr>
+<td>294</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'catch rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>293</td></tr>
+<td>296</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>295</td></tr>
+<td>298</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>296</td></tr>
+<td>299</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>297</td></tr>
+<td>300</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>298</td></tr>
+<td>301</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>299</td></tr>
+<td>302</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>300</td></tr>
+<td>303</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>301</td></tr>
+<td>304</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>302</td></tr>
+<td>305</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>303</td></tr>
+<td>306</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 133).</td>
-<td>303</td></tr>
+<td>306</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>304</td></tr>
+<td>307</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>306</td></tr>
+<td>309</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 149).</td>
-<td>306</td></tr>
+<td>309</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>307</td></tr>
+<td>310</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 12, expected level should be 6.</td>
-<td>308</td></tr>
+<td>311</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>309</td></tr>
+<td>312</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>310</td></tr>
+<td>313</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>311</td></tr>
+<td>314</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>313</td></tr>
+<td>316</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 140).</td>
-<td>313</td></tr>
+<td>316</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 12, expected level should be 6.</td>
-<td>314</td></tr>
+<td>317</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>315</td></tr>
+<td>318</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>316</td></tr>
+<td>319</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>317</td></tr>
+<td>320</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>319</td></tr>
+<td>322</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>320</td></tr>
+<td>323</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>324</td></tr>
+<td>327</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>325</td></tr>
+<td>328</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>326</td></tr>
+<td>329</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>327</td></tr>
+<td>330</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>329</td></tr>
+<td>332</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>330</td></tr>
+<td>333</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>332</td></tr>
+<td>335</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>333</td></tr>
+<td>336</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 161).</td>
-<td>333</td></tr>
+<td>336</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while' has incorrect indentation level 8, expected level should be 4.</td>
-<td>335</td></tr>
+<td>338</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>336</td></tr>
+<td>339</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 12, expected level should be 6.</td>
-<td>337</td></tr>
+<td>340</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>338</td></tr>
+<td>341</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' child has incorrect indentation level 16, expected level should be 8.</td>
-<td>339</td></tr>
+<td>342</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if rcurly' has incorrect indentation level 12, expected level should be 6.</td>
-<td>340</td></tr>
+<td>343</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>341</td></tr>
+<td>344</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'while rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>342</td></tr>
+<td>345</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>344</td></tr>
+<td>347</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>345</td></tr>
+<td>348</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>347</td></tr>
+<td>350</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>348</td></tr>
+<td>351</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>349</td></tr>
+<td>352</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>350</td></tr>
+<td>353</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>351</td></tr>
+<td>354</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>352</td></tr>
+<td>355</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>353</td></tr>
+<td>356</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>354</td></tr>
+<td>357</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>356</td></tr>
+<td>359</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>359</td></tr>
+<td>362</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>360</td></tr>
+<td>363</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>361</td></tr>
+<td>364</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>362</td></tr>
+<td>365</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>364</td></tr>
+<td>367</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>365</td></tr>
+<td>368</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>366</td></tr>
+<td>369</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>367</td></tr>
+<td>370</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>368</td></tr>
+<td>371</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>369</td></tr>
+<td>372</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>370</td></tr>
+<td>373</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 8, expected level should be 4.</td>
-<td>371</td></tr>
+<td>374</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>372</td></tr>
+<td>375</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>374</td></tr>
+<td>377</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' has incorrect indentation level 8, expected level should be 4.</td>
-<td>375</td></tr>
+<td>378</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for' child has incorrect indentation level 12, expected level should be 6.</td>
-<td>376</td></tr>
+<td>379</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'for rcurly' has incorrect indentation level 8, expected level should be 4.</td>
-<td>377</td></tr>
+<td>380</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def rcurly' has incorrect indentation level 4, expected level should be 2.</td>
-<td>378</td></tr>
+<td>381</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def modifier' has incorrect indentation level 4, expected level should be 2.</td>
-<td>380</td></tr>
+<td>383</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td>381</td></tr>
+<td>384</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'if' has incorrect indentation level 6, expected level should be 4.</td>
-<td>381</td></tr>
+<td>384</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>indentation</td>
 <td>Indentation</td>
 <td>'method def' child has incorrect indentation level 6, expected level should be 4.</td>
-<td>387</td></tr>
+<td>390</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#1

<TRUNCATED>

[35/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
index 3e3acbe..e2dc8f5 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
@@ -48,376 +48,379 @@
 <span class="sourceLineNo">040</span>import org.apache.hadoop.mapred.OutputFormat;<a name="line.40"></a>
 <span class="sourceLineNo">041</span>import org.apache.hadoop.mapred.TextInputFormat;<a name="line.41"></a>
 <span class="sourceLineNo">042</span>import org.apache.hadoop.mapred.TextOutputFormat;<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>import java.io.IOException;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import java.util.Collection;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import java.util.Map;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * Utility for {@link TableMap} and {@link TableReduce}<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>@InterfaceAudience.Public<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class TableMapReduceUtil {<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * Use this before submitting a TableMap job. It will<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * appropriately set up the JobConf.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   *<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   * @param table  The table name to read from.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   * @param columns  The columns to scan.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * @param mapper  The mapper class to use.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * @param outputKeyClass  The class of the output key.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * @param outputValueClass  The class of the output value.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @param job  The current job configuration to adjust.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static void initTableMapJob(String table, String columns,<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    Class&lt;?&gt; outputKeyClass,<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    Class&lt;?&gt; outputValueClass, JobConf job) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      true, TableInputFormat.class);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public static void initTableMapJob(String table, String columns,<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    Class&lt;?&gt; outputKeyClass,<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      addDependencyJars, TableInputFormat.class);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * Use this before submitting a TableMap job. It will<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   * appropriately set up the JobConf.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   *<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * @param table  The table name to read from.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @param columns  The columns to scan.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   * @param mapper  The mapper class to use.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @param outputKeyClass  The class of the output key.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   * @param outputValueClass  The class of the output value.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   * @param job  The current job configuration to adjust.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   *           job classes via the distributed cache (tmpjars).<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public static void initTableMapJob(String table, String columns,<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    Class&lt;?&gt; outputKeyClass,<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars,<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    Class&lt;? extends InputFormat&gt; inputFormat) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>    job.setInputFormat(inputFormat);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    job.setMapOutputValueClass(outputValueClass);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    job.setMapOutputKeyClass(outputKeyClass);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    job.setMapperClass(mapper);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    FileInputFormat.addInputPaths(job, table);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    job.set(TableInputFormat.COLUMN_LIST, columns);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    if (addDependencyJars) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      try {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        addDependencyJars(job);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      } catch (IOException e) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        e.printStackTrace();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    try {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      initCredentials(job);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    } catch (IOException ioe) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      // just spit out the stack trace?  really?<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      ioe.printStackTrace();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   * Sets up the job for reading from one or more multiple table snapshots, with one or more scans<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   * per snapshot.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   * It bypasses hbase servers and read directly from snapshot files.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   *<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   * @param snapshotScans     map of snapshot name to scans on that snapshot.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   * @param mapper            The mapper class to use.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   * @param outputKeyClass    The class of the output key.<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * @param outputValueClass  The class of the output value.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * @param job               The current job to adjust.  Make sure the passed job is<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   *                          carrying all necessary HBase configuration.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   *                          job classes via the distributed cache (tmpjars).<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public static void initMultiTableSnapshotMapperJob(Map&lt;String, Collection&lt;Scan&gt;&gt; snapshotScans,<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      Class&lt;? extends TableMap&gt; mapper, Class&lt;?&gt; outputKeyClass, Class&lt;?&gt; outputValueClass,<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      JobConf job, boolean addDependencyJars, Path tmpRestoreDir) throws IOException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    MultiTableSnapshotInputFormat.setInput(job, snapshotScans, tmpRestoreDir);<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>    job.setInputFormat(MultiTableSnapshotInputFormat.class);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    if (outputValueClass != null) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      job.setMapOutputValueClass(outputValueClass);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    if (outputKeyClass != null) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      job.setMapOutputKeyClass(outputKeyClass);<a name="line.148"></a>
+<span class="sourceLineNo">043</span>import org.slf4j.Logger;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.LoggerFactory;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>import java.io.IOException;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import java.util.Collection;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import java.util.Map;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Utility for {@link TableMap} and {@link TableReduce}<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@InterfaceAudience.Public<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class TableMapReduceUtil {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private static final Logger LOG = LoggerFactory.getLogger(TableMapReduceUtil.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * Use this before submitting a TableMap job. It will<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * appropriately set up the JobConf.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   *<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   * @param table  The table name to read from.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   * @param columns  The columns to scan.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   * @param mapper  The mapper class to use.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * @param outputKeyClass  The class of the output key.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * @param outputValueClass  The class of the output value.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param job  The current job configuration to adjust.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public static void initTableMapJob(String table, String columns,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    Class&lt;?&gt; outputKeyClass,<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    Class&lt;?&gt; outputValueClass, JobConf job) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      true, TableInputFormat.class);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  public static void initTableMapJob(String table, String columns,<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    Class&lt;?&gt; outputKeyClass,<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      addDependencyJars, TableInputFormat.class);<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>  /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * Use this before submitting a TableMap job. It will<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * appropriately set up the JobConf.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   *<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * @param table  The table name to read from.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * @param columns  The columns to scan.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * @param mapper  The mapper class to use.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @param outputKeyClass  The class of the output key.<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   * @param outputValueClass  The class of the output value.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * @param job  The current job configuration to adjust.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   *           job classes via the distributed cache (tmpjars).<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public static void initTableMapJob(String table, String columns,<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    Class&lt;? extends TableMap&gt; mapper,<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    Class&lt;?&gt; outputKeyClass,<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    Class&lt;?&gt; outputValueClass, JobConf job, boolean addDependencyJars,<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    Class&lt;? extends InputFormat&gt; inputFormat) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>    job.setInputFormat(inputFormat);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    job.setMapOutputValueClass(outputValueClass);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    job.setMapOutputKeyClass(outputKeyClass);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    job.setMapperClass(mapper);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    FileInputFormat.addInputPaths(job, table);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    job.set(TableInputFormat.COLUMN_LIST, columns);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (addDependencyJars) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      try {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        addDependencyJars(job);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      } catch (IOException e) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        LOG.error("IOException encountered while adding dependency jars", e);<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>    try {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      initCredentials(job);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    } catch (IOException ioe) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      // just spit out the stack trace?  really?<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      LOG.error("IOException encountered while initializing credentials", ioe);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * Sets up the job for reading from one or more multiple table snapshots, with one or more scans<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * per snapshot.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * It bypasses hbase servers and read directly from snapshot files.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   *<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @param snapshotScans     map of snapshot name to scans on that snapshot.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @param mapper            The mapper class to use.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   * @param outputKeyClass    The class of the output key.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * @param outputValueClass  The class of the output value.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   * @param job               The current job to adjust.  Make sure the passed job is<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   *                          carrying all necessary HBase configuration.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   *                          job classes via the distributed cache (tmpjars).<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public static void initMultiTableSnapshotMapperJob(Map&lt;String, Collection&lt;Scan&gt;&gt; snapshotScans,<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      Class&lt;? extends TableMap&gt; mapper, Class&lt;?&gt; outputKeyClass, Class&lt;?&gt; outputValueClass,<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      JobConf job, boolean addDependencyJars, Path tmpRestoreDir) throws IOException {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    MultiTableSnapshotInputFormat.setInput(job, snapshotScans, tmpRestoreDir);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    job.setInputFormat(MultiTableSnapshotInputFormat.class);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    if (outputValueClass != null) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      job.setMapOutputValueClass(outputValueClass);<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    job.setMapperClass(mapper);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    if (addDependencyJars) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      addDependencyJars(job);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  }<a name="line.156"></a>
+<span class="sourceLineNo">150</span>    if (outputKeyClass != null) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      job.setMapOutputKeyClass(outputKeyClass);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    job.setMapperClass(mapper);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    if (addDependencyJars) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      addDependencyJars(job);<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>  /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.159"></a>
-<span class="sourceLineNo">160</span>   * and read directly from snapshot files.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   *<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * @param columns  The columns to scan.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @param mapper  The mapper class to use.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * @param outputKeyClass  The class of the output key.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @param outputValueClass  The class of the output value.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * @param job  The current job to adjust.  Make sure the passed job is<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * carrying all necessary HBase configuration.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   *           job classes via the distributed cache (tmpjars).<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * After the job is finished, restore directory can be deleted.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   * @throws IOException When setting up the details fails.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   * @see TableSnapshotInputFormat<a name="line.175"></a>
-<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      Class&lt;? extends TableMap&gt; mapper,<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      Class&lt;?&gt; outputKeyClass,<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      Class&lt;?&gt; outputValueClass, JobConf job,<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      boolean addDependencyJars, Path tmpRestoreDir)<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  throws IOException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      addDependencyJars, TableSnapshotInputFormat.class);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>  /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   * and read directly from snapshot files.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   *<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * @param columns  The columns to scan.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * @param mapper  The mapper class to use.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * @param outputKeyClass  The class of the output key.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @param outputValueClass  The class of the output value.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @param jobConf  The current job to adjust.  Make sure the passed job is<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * carrying all necessary HBase configuration.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   *           job classes via the distributed cache (tmpjars).<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * After the job is finished, restore directory can be deleted.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @param splitAlgo algorithm to split<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @param numSplitsPerRegion how many input splits to generate per one region<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   * @throws IOException When setting up the details fails.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   * @see TableSnapshotInputFormat<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.210"></a>
-<span class="sourceLineNo">211</span>                                             Class&lt;? extends TableMap&gt; mapper,<a name="line.211"></a>
-<span class="sourceLineNo">212</span>                                             Class&lt;?&gt; outputKeyClass,<a name="line.212"></a>
-<span class="sourceLineNo">213</span>                                             Class&lt;?&gt; outputValueClass, JobConf jobConf,<a name="line.213"></a>
-<span class="sourceLineNo">214</span>                                             boolean addDependencyJars, Path tmpRestoreDir,<a name="line.214"></a>
-<span class="sourceLineNo">215</span>                                             RegionSplitter.SplitAlgorithm splitAlgo,<a name="line.215"></a>
-<span class="sourceLineNo">216</span>                                             int numSplitsPerRegion)<a name="line.216"></a>
-<span class="sourceLineNo">217</span>          throws IOException {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    TableSnapshotInputFormat.setInput(jobConf, snapshotName, tmpRestoreDir, splitAlgo,<a name="line.218"></a>
-<span class="sourceLineNo">219</span>            numSplitsPerRegion);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, jobConf,<a name="line.220"></a>
-<span class="sourceLineNo">221</span>            addDependencyJars, TableSnapshotInputFormat.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(jobConf);<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><a name="line.225"></a>
-<span class="sourceLineNo">226</span>  /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   * Use this before submitting a TableReduce job. It will<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   * appropriately set up the JobConf.<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   *<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * @param table  The output table.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   * @param reducer  The reducer class to use.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @param job  The current job configuration to adjust.<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @throws IOException When determining the region count fails.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  public static void initTableReduceJob(String table,<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job)<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    initTableReduceJob(table, reducer, job, null);<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>  /**<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * Use this before submitting a TableReduce job. It will<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * appropriately set up the JobConf.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   *<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param table  The output table.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   * @param reducer  The reducer class to use.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   * @param job  The current job configuration to adjust.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   * default partitioner.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * @throws IOException When determining the region count fails.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  public static void initTableReduceJob(String table,<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner)<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  throws IOException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    initTableReduceJob(table, reducer, job, partitioner, true);<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>  /**<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   * Use this before submitting a TableReduce job. It will<a name="line.259"></a>
-<span class="sourceLineNo">260</span>   * appropriately set up the JobConf.<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   *<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * @param table  The output table.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param reducer  The reducer class to use.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @param job  The current job configuration to adjust.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   * default partitioner.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.267"></a>
-<span class="sourceLineNo">268</span>   *           job classes via the distributed cache (tmpjars).<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   * @throws IOException When determining the region count fails.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  public static void initTableReduceJob(String table,<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner,<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    boolean addDependencyJars) throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    job.setOutputFormat(TableOutputFormat.class);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    job.setReducerClass(reducer);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    job.set(TableOutputFormat.OUTPUT_TABLE, table);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    job.setOutputKeyClass(ImmutableBytesWritable.class);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    job.setOutputValueClass(Put.class);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    if (partitioner == HRegionPartitioner.class) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      job.setPartitionerClass(HRegionPartitioner.class);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      int regions =<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      if (job.getNumReduceTasks() &gt; regions) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        job.setNumReduceTasks(regions);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    } else if (partitioner != null) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      job.setPartitionerClass(partitioner);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    if (addDependencyJars) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      addDependencyJars(job);<a name="line.292"></a>
+<span class="sourceLineNo">158</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * and read directly from snapshot files.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   *<a name="line.164"></a>
+<span class="sourceLineNo">165</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   * @param columns  The columns to scan.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   * @param mapper  The mapper class to use.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   * @param outputKeyClass  The class of the output key.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * @param outputValueClass  The class of the output value.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * @param job  The current job to adjust.  Make sure the passed job is<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * carrying all necessary HBase configuration.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   *           job classes via the distributed cache (tmpjars).<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   * After the job is finished, restore directory can be deleted.<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   * @throws IOException When setting up the details fails.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   * @see TableSnapshotInputFormat<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      Class&lt;? extends TableMap&gt; mapper,<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      Class&lt;?&gt; outputKeyClass,<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      Class&lt;?&gt; outputValueClass, JobConf job,<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      boolean addDependencyJars, Path tmpRestoreDir)<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  throws IOException {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, job,<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      addDependencyJars, TableSnapshotInputFormat.class);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * Sets up the job for reading from a table snapshot. It bypasses hbase servers<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * and read directly from snapshot files.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   *<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param snapshotName The name of the snapshot (of a table) to read from.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * @param columns  The columns to scan.<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @param mapper  The mapper class to use.<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * @param outputKeyClass  The class of the output key.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   * @param outputValueClass  The class of the output value.<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   * @param jobConf  The current job to adjust.  Make sure the passed job is<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * carrying all necessary HBase configuration.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   *           job classes via the distributed cache (tmpjars).<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param tmpRestoreDir a temporary directory to copy the snapshot files into. Current user should<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * have write permissions to this directory, and this should not be a subdirectory of rootdir.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * After the job is finished, restore directory can be deleted.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * @param splitAlgo algorithm to split<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * @param numSplitsPerRegion how many input splits to generate per one region<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * @throws IOException When setting up the details fails.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * @see TableSnapshotInputFormat<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public static void initTableSnapshotMapJob(String snapshotName, String columns,<a name="line.213"></a>
+<span class="sourceLineNo">214</span>                                             Class&lt;? extends TableMap&gt; mapper,<a name="line.214"></a>
+<span class="sourceLineNo">215</span>                                             Class&lt;?&gt; outputKeyClass,<a name="line.215"></a>
+<span class="sourceLineNo">216</span>                                             Class&lt;?&gt; outputValueClass, JobConf jobConf,<a name="line.216"></a>
+<span class="sourceLineNo">217</span>                                             boolean addDependencyJars, Path tmpRestoreDir,<a name="line.217"></a>
+<span class="sourceLineNo">218</span>                                             RegionSplitter.SplitAlgorithm splitAlgo,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>                                             int numSplitsPerRegion)<a name="line.219"></a>
+<span class="sourceLineNo">220</span>          throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    TableSnapshotInputFormat.setInput(jobConf, snapshotName, tmpRestoreDir, splitAlgo,<a name="line.221"></a>
+<span class="sourceLineNo">222</span>            numSplitsPerRegion);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, jobConf,<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            addDependencyJars, TableSnapshotInputFormat.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(jobConf);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  }<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>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * Use this before submitting a TableReduce job. It will<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * appropriately set up the JobConf.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   *<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param table  The output table.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param reducer  The reducer class to use.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param job  The current job configuration to adjust.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @throws IOException When determining the region count fails.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  public static void initTableReduceJob(String table,<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job)<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    initTableReduceJob(table, reducer, job, null);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>  /**<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * Use this before submitting a TableReduce job. It will<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * appropriately set up the JobConf.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   *<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param table  The output table.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   * @param reducer  The reducer class to use.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   * @param job  The current job configuration to adjust.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   * default partitioner.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   * @throws IOException When determining the region count fails.<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   */<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  public static void initTableReduceJob(String table,<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner)<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  throws IOException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    initTableReduceJob(table, reducer, job, partitioner, true);<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>  /**<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   * Use this before submitting a TableReduce job. It will<a name="line.262"></a>
+<span class="sourceLineNo">263</span>   * appropriately set up the JobConf.<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   *<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param table  The output table.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @param reducer  The reducer class to use.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * @param job  The current job configuration to adjust.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * @param partitioner  Partitioner to use. Pass &lt;code&gt;null&lt;/code&gt; to use<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   * default partitioner.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   * @param addDependencyJars upload HBase jars and jars for any of the configured<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   *           job classes via the distributed cache (tmpjars).<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * @throws IOException When determining the region count fails.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   */<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  public static void initTableReduceJob(String table,<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    Class&lt;? extends TableReduce&gt; reducer, JobConf job, Class partitioner,<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    boolean addDependencyJars) throws IOException {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    job.setOutputFormat(TableOutputFormat.class);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    job.setReducerClass(reducer);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    job.set(TableOutputFormat.OUTPUT_TABLE, table);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    job.setOutputKeyClass(ImmutableBytesWritable.class);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    job.setOutputValueClass(Put.class);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    job.setStrings("io.serializations", job.get("io.serializations"),<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        MutationSerialization.class.getName(), ResultSerialization.class.getName());<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    if (partitioner == HRegionPartitioner.class) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      job.setPartitionerClass(HRegionPartitioner.class);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      int regions =<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      if (job.getNumReduceTasks() &gt; regions) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        job.setNumReduceTasks(regions);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    } else if (partitioner != null) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      job.setPartitionerClass(partitioner);<a name="line.292"></a>
 <span class="sourceLineNo">293</span>    }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    initCredentials(job);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public static void initCredentials(JobConf job) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    UserProvider userProvider = UserProvider.instantiate(job);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    if (userProvider.isHadoopSecurityEnabled()) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      // propagate delegation related props from launcher job to MR job<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      if (System.getenv("HADOOP_TOKEN_FILE_LOCATION") != null) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        job.set("mapreduce.job.credentials.binary", System.getenv("HADOOP_TOKEN_FILE_LOCATION"));<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    if (userProvider.isHBaseSecurityEnabled()) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      Connection conn = ConnectionFactory.createConnection(job);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      try {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        // login the server principal (if using secure Hadoop)<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        User user = userProvider.getCurrent();<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        TokenUtil.addTokenForJob(conn, job, user);<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      } catch (InterruptedException ie) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        ie.printStackTrace();<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        Thread.currentThread().interrupt();<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      } finally {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        conn.close();<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    }<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>   * Ensures that the given number of reduce tasks for the given job<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * configuration does not exceed the number of regions for the given table.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   *<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   * @param table  The table to get the region count for.<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * @param job  The current job configuration to adjust.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   * @throws IOException When retrieving the table details fails.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  // Used by tests.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  public static void limitNumReduceTasks(String table, JobConf job)<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  throws IOException {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    int regions =<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    if (job.getNumReduceTasks() &gt; regions)<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      job.setNumReduceTasks(regions);<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>   * Ensures that the given number of map tasks for the given job<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * configuration does not exceed the number of regions for the given table.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   *<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   * @param table  The table to get the region count for.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>   * @param job  The current job configuration to adjust.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * @throws IOException When retrieving the table details fails.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   */<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  // Used by tests.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  public static void limitNumMapTasks(String table, JobConf job)<a name="line.347"></a>
-<span class="sourceLineNo">348</span>  throws IOException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    int regions =<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    if (job.getNumMapTasks() &gt; regions)<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      job.setNumMapTasks(regions);<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>  /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * Sets the number of reduce tasks for the given job configuration to the<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * number of regions the given table has.<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   *<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * @param table  The table to get the region count for.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * @param job  The current job configuration to adjust.<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * @throws IOException When retrieving the table details fails.<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   */<a name="line.362"></a>
-<span class="sourceLineNo">363</span>  public static void setNumReduceTasks(String table, JobConf job)<a name="line.363"></a>
-<span class="sourceLineNo">364</span>  throws IOException {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    job.setNumReduceTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      TableName.valueOf(table)));<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>  /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span>   * Sets the number of map tasks for the given job configuration to the<a name="line.370"></a>
-<span class="sourceLineNo">371</span>   * number of regions the given table has.<a name="line.371"></a>
-<span class="sourceLineNo">372</span>   *<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   * @param table  The table to get the region count for.<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   * @param job  The current job configuration to adjust.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @throws IOException When retrieving the table details fails.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public static void setNumMapTasks(String table, JobConf job)<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  throws IOException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    job.setNumMapTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      TableName.valueOf(table)));<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<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>   * Sets the number of rows to return and cache with each scanner iteration.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Higher caching values will enable faster mapreduce jobs at the expense of<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * requiring more heap to contain the cached rows.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   *<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param job The current job configuration to adjust.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @param batchSize The number of rows to return in batch with each scanner<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   * iteration.<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   */<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  public static void setScannerCaching(JobConf job, int batchSize) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    job.setInt("hbase.client.scanner.caching", batchSize);<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>   * @see org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil#addDependencyJars(org.apache.hadoop.mapreduce.Job)<a name="line.397"></a>
-<span class="sourceLineNo">398</span>   */<a name="line.398"></a>
-<span class="sourceLineNo">399</span>  public static void addDependencyJars(JobConf job) throws IOException {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addHBaseDependencyJars(job);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJarsForClasses(<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      job,<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      job.getMapOutputKeyClass(),<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      job.getMapOutputValueClass(),<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      job.getOutputKeyClass(),<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      job.getOutputValueClass(),<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      job.getPartitionerClass(),<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      job.getClass("mapred.input.format.class", TextInputFormat.class, InputFormat.class),<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      job.getClass("mapred.output.format.class", TextOutputFormat.class, OutputFormat.class),<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      job.getCombinerClass());<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">294</span>    if (addDependencyJars) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      addDependencyJars(job);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    initCredentials(job);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>  public static void initCredentials(JobConf job) throws IOException {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    UserProvider userProvider = UserProvider.instantiate(job);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    if (userProvider.isHadoopSecurityEnabled()) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      // propagate delegation related props from launcher job to MR job<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      if (System.getenv("HADOOP_TOKEN_FILE_LOCATION") != null) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        job.set("mapreduce.job.credentials.binary", System.getenv("HADOOP_TOKEN_FILE_LOCATION"));<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      }<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>    if (userProvider.isHBaseSecurityEnabled()) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      Connection conn = ConnectionFactory.createConnection(job);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      try {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        // login the server principal (if using secure Hadoop)<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        User user = userProvider.getCurrent();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        TokenUtil.addTokenForJob(conn, job, user);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      } catch (InterruptedException ie) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        LOG.error("Interrupted obtaining user authentication token", ie);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        Thread.currentThread().interrupt();<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      } finally {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        conn.close();<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>  }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>  /**<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   * Ensures that the given number of reduce tasks for the given job<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   * configuration does not exceed the number of regions for the given table.<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   *<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * @param table  The table to get the region count for.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * @param job  The current job configuration to adjust.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @throws IOException When retrieving the table details fails.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  // Used by tests.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void limitNumReduceTasks(String table, JobConf job)<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  throws IOException {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    int regions =<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    if (job.getNumReduceTasks() &gt; regions)<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      job.setNumReduceTasks(regions);<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>  /**<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * Ensures that the given number of map tasks for the given job<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   * configuration does not exceed the number of regions for the given table.<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   *<a name="line.344"></a>
+<span class="sourceLineNo">345</span>   * @param table  The table to get the region count for.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   * @param job  The current job configuration to adjust.<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * @throws IOException When retrieving the table details fails.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  // Used by tests.<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  public static void limitNumMapTasks(String table, JobConf job)<a name="line.350"></a>
+<span class="sourceLineNo">351</span>  throws IOException {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    int regions =<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job), TableName.valueOf(table));<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    if (job.getNumMapTasks() &gt; regions)<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      job.setNumMapTasks(regions);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>  /**<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * Sets the number of reduce tasks for the given job configuration to the<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * number of regions the given table has.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   *<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * @param table  The table to get the region count for.<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * @param job  The current job configuration to adjust.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * @throws IOException When retrieving the table details fails.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   */<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  public static void setNumReduceTasks(String table, JobConf job)<a name="line.366"></a>
+<span class="sourceLineNo">367</span>  throws IOException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    job.setNumReduceTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      TableName.valueOf(table)));<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>  /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   * Sets the number of map tasks for the given job configuration to the<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   * number of regions the given table has.<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   *<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   * @param table  The table to get the region count for.<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * @param job  The current job configuration to adjust.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * @throws IOException When retrieving the table details fails.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   */<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  public static void setNumMapTasks(String table, JobConf job)<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    job.setNumMapTasks(MetaTableAccessor.getRegionCount(HBaseConfiguration.create(job),<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      TableName.valueOf(table)));<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<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>   * Sets the number of rows to return and cache with each scanner iteration.<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * Higher caching values will enable faster mapreduce jobs at the expense of<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * requiring more heap to contain the cached rows.<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   *<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @param job The current job configuration to adjust.<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   * @param batchSize The number of rows to return in batch with each scanner<a name="line.392"></a>
+<span class="sourceLineNo">393</span>   * iteration.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  public static void setScannerCaching(JobConf job, int batchSize) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    job.setInt("hbase.client.scanner.caching", batchSize);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span>  /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   * @see org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil#addDependencyJars(org.apache.hadoop.mapreduce.Job)<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   */<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  public static void addDependencyJars(JobConf job) throws IOException {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addHBaseDependencyJars(job);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJarsForClasses(<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      job,<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      job.getMapOutputKeyClass(),<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      job.getMapOutputValueClass(),<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      job.getOutputKeyClass(),<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      job.getOutputValueClass(),<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      job.getPartitionerClass(),<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      job.getClass("mapred.input.format.class", TextInputFormat.class, InputFormat.class),<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      job.getClass("mapred.output.format.class", TextOutputFormat.class, OutputFormat.class),<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      job.getCombinerClass());<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>}<a name="line.415"></a>
 
 
 


[02/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
index ee05a1d..06f2ffa 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
@@ -138,1307 +138,1310 @@
 <span class="sourceLineNo">130</span>  private Path OLDLOGDIR;<a name="line.130"></a>
 <span class="sourceLineNo">131</span>  private Path CORRUPTDIR;<a name="line.131"></a>
 <span class="sourceLineNo">132</span>  private Path TABLEDIR;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  private static final int NUM_WRITERS = 10;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private static final int ENTRIES = 10; // entries per writer per region<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private static final String FILENAME_BEING_SPLIT = "testfile";<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  private static final TableName TABLE_NAME =<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      TableName.valueOf("t1");<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  private static final byte[] FAMILY = Bytes.toBytes("f1");<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private static final byte[] QUALIFIER = Bytes.toBytes("q1");<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private static final byte[] VALUE = Bytes.toBytes("v1");<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  private static final String WAL_FILE_PREFIX = "wal.dat.";<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static List&lt;String&gt; REGIONS = new ArrayList&lt;&gt;();<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  private static final String HBASE_SKIP_ERRORS = "hbase.hlog.split.skip.errors";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private static String ROBBER;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  private static String ZOMBIE;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  private static String [] GROUP = new String [] {"supergroup"};<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>  static enum Corruptions {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    INSERT_GARBAGE_ON_FIRST_LINE,<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    INSERT_GARBAGE_IN_THE_MIDDLE,<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    APPEND_GARBAGE,<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    TRUNCATE,<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    TRUNCATE_TRAILER<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>  @BeforeClass<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  public static void setUpBeforeClass() throws Exception {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    conf = TEST_UTIL.getConfiguration();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    conf.setClass("hbase.regionserver.hlog.writer.impl",<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        InstrumentedLogWriter.class, Writer.class);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    // This is how you turn off shortcircuit read currently.  TODO: Fix.  Should read config.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    System.setProperty("hbase.tests.use.shortcircuit.reads", "false");<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    // Create fake maping user to group and set it to the conf.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    Map&lt;String, String []&gt; u2g_map = new HashMap&lt;&gt;(2);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    ROBBER = User.getCurrent().getName() + "-robber";<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    ZOMBIE = User.getCurrent().getName() + "-zombie";<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    u2g_map.put(ROBBER, GROUP);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    u2g_map.put(ZOMBIE, GROUP);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    DFSTestUtil.updateConfWithFakeGroupMapping(conf, u2g_map);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    conf.setInt("dfs.heartbeat.interval", 1);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    TEST_UTIL.startMiniDFSCluster(2);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @AfterClass<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public static void tearDownAfterClass() throws Exception {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    TEST_UTIL.shutdownMiniDFSCluster();<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>  @Rule<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public TestName name = new TestName();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  private WALFactory wals = null;<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  @Before<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public void setUp() throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    LOG.info("Cleaning up cluster for new test.");<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    fs = TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    HBASEDIR = TEST_UTIL.createRootDir();<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    HBASELOGDIR = TEST_UTIL.createWALRootDir();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    OLDLOGDIR = new Path(HBASELOGDIR, HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    CORRUPTDIR = new Path(HBASELOGDIR, HConstants.CORRUPT_DIR_NAME);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    TABLEDIR = FSUtils.getTableDir(HBASEDIR, TABLE_NAME);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    REGIONS.clear();<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    Collections.addAll(REGIONS, "bbb", "ccc");<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    InstrumentedLogWriter.activateFailure = false;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    wals = new WALFactory(conf, name.getMethodName());<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    WALDIR = new Path(HBASELOGDIR,<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        AbstractFSWALProvider.getWALDirectoryName(ServerName.valueOf(name.getMethodName(),<a name="line.199"></a>
-<span class="sourceLineNo">200</span>            16010, System.currentTimeMillis()).toString()));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    //fs.mkdirs(WALDIR);<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>  @After<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  public void tearDown() throws Exception {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    try {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      wals.close();<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    } catch(IOException exception) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      // Some tests will move WALs out from under us. In those cases, we'll get an error on close.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      LOG.info("Ignoring an error while closing down our WALFactory. Fine for some tests, but if" +<a name="line.210"></a>
-<span class="sourceLineNo">211</span>          " you see a failure look here.");<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      LOG.debug("exception details", exception);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    } finally {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      wals = null;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      fs.delete(HBASEDIR, true);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      fs.delete(HBASELOGDIR, true);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<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>   * Simulates splitting a WAL out from under a regionserver that is still trying to write it.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * Ensures we do not lose edits.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * @throws IOException<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   * @throws InterruptedException<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  @Test<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // Region we'll write edits too and then later examine to make sure they all made it in.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    final String region = REGIONS.get(0);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    final int numWriters = 3;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Thread zombie = new ZombieLastLogWriterRegionServer(counter, stop, region, numWriters);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    try {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      long startCount = counter.get();<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      zombie.start();<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      // Wait till writer starts going.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      while (startCount == counter.get()) Threads.sleep(1);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      // Give it a second to write a few appends.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      Threads.sleep(1000);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      final Configuration conf2 = HBaseConfiguration.create(conf);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      final User robber = User.createUserForTesting(conf2, ROBBER, GROUP);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      int count = robber.runAs(new PrivilegedExceptionAction&lt;Integer&gt;() {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        @Override<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        public Integer run() throws Exception {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>          StringBuilder ls = new StringBuilder("Contents of WALDIR (").append(WALDIR)<a name="line.246"></a>
-<span class="sourceLineNo">247</span>              .append("):\n");<a name="line.247"></a>
-<span class="sourceLineNo">248</span>          for (FileStatus status : fs.listStatus(WALDIR)) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>            ls.append("\t").append(status.toString()).append("\n");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>          LOG.debug(Objects.toString(ls));<a name="line.251"></a>
-<span class="sourceLineNo">252</span>          LOG.info("Splitting WALs out from under zombie. Expecting " + numWriters + " files.");<a name="line.252"></a>
-<span class="sourceLineNo">253</span>          WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf2, wals);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>          LOG.info("Finished splitting out from under zombie.");<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>          assertEquals("wrong number of split files for region", numWriters, logfiles.length);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          int count = 0;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          for (Path logfile: logfiles) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            count += countWAL(logfile);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>          }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>          return count;<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      });<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      LOG.info("zombie=" + counter.get() + ", robber=" + count);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      assertTrue("The log file could have at most 1 extra log entry, but can't have less. " +<a name="line.265"></a>
-<span class="sourceLineNo">266</span>              "Zombie could write " + counter.get() + " and logfile had only " + count,<a name="line.266"></a>
-<span class="sourceLineNo">267</span>          counter.get() == count || counter.get() + 1 == count);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    } finally {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      stop.set(true);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      zombie.interrupt();<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Threads.threadDumpingIsAlive(zombie);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    }<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>  /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * This thread will keep writing to a 'wal' file even after the split process has started.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   * It simulates a region server that was considered dead but woke up and wrote some more to the<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   * last log entry. Does its writing as an alternate user in another filesystem instance to<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * simulate better it being a regionserver.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   */<a name="line.280"></a>
-<span class="sourceLineNo">281</span>  class ZombieLastLogWriterRegionServer extends Thread {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    final AtomicLong editsCount;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    final AtomicBoolean stop;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    final int numOfWriters;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span>     * Region to write edits for.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>     */<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    final String region;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    final User user;<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    public ZombieLastLogWriterRegionServer(AtomicLong counter, AtomicBoolean stop,<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        final String region, final int writers)<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        throws IOException, InterruptedException {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      super("ZombieLastLogWriterRegionServer");<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      setDaemon(true);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      this.stop = stop;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      this.editsCount = counter;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      this.region = region;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      this.user = User.createUserForTesting(conf, ZOMBIE, GROUP);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      numOfWriters = writers;<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>
-<span class="sourceLineNo">303</span>    @Override<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    public void run() {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        doWriting();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      } catch (IOException e) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        LOG.warn(getName() + " Writer exiting " + e);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } catch (InterruptedException e) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        LOG.warn(getName() + " Writer exiting " + e);<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><a name="line.313"></a>
-<span class="sourceLineNo">314</span>    private void doWriting() throws IOException, InterruptedException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      this.user.runAs(new PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        @Override<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        public Object run() throws Exception {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          // Index of the WAL we want to keep open.  generateWALs will leave open the WAL whose<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          // index we supply here.<a name="line.319"></a>
-<span class="sourceLineNo">320</span>          int walToKeepOpen = numOfWriters - 1;<a name="line.320"></a>
-<span class="sourceLineNo">321</span>          // The below method writes numOfWriters files each with ENTRIES entries for a total of<a name="line.321"></a>
-<span class="sourceLineNo">322</span>          // numOfWriters * ENTRIES added per column family in the region.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>          Writer writer = null;<a name="line.323"></a>
-<span class="sourceLineNo">324</span>          try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>            writer = generateWALs(numOfWriters, ENTRIES, walToKeepOpen);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>          } catch (IOException e1) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>            throw new RuntimeException("Failed", e1);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>          }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>          // Update counter so has all edits written so far.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>          editsCount.addAndGet(numOfWriters * ENTRIES);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>          loop(writer);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>          // If we've been interruped, then things should have shifted out from under us.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>          // closing should error<a name="line.333"></a>
-<span class="sourceLineNo">334</span>          try {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>            writer.close();<a name="line.335"></a>
-<span class="sourceLineNo">336</span>            fail("Writing closing after parsing should give an error.");<a name="line.336"></a>
-<span class="sourceLineNo">337</span>          } catch (IOException exception) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>            LOG.debug("ignoring error when closing final writer.", exception);<a name="line.338"></a>
-<span class="sourceLineNo">339</span>          }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>          return null;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      });<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>    private void loop(final Writer writer) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      byte [] regionBytes = Bytes.toBytes(this.region);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      while (!stop.get()) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        try {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>          long seq = appendEntry(writer, TABLE_NAME, regionBytes,<a name="line.349"></a>
-<span class="sourceLineNo">350</span>              Bytes.toBytes("r" + editsCount.get()), regionBytes, QUALIFIER, VALUE, 0);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          long count = editsCount.incrementAndGet();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>          LOG.info(getName() + " sync count=" + count + ", seq=" + seq);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          try {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            Thread.sleep(1);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>          } catch (InterruptedException e) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            //<a name="line.356"></a>
-<span class="sourceLineNo">357</span>          }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>        } catch (IOException ex) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          LOG.error(getName() + " ex " + ex.toString());<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (ex instanceof RemoteException) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            LOG.error("Juliet: got RemoteException " + ex.getMessage() +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                " while writing " + (editsCount.get() + 1));<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          } else {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>            LOG.error(getName() + " failed to write....at " + editsCount.get());<a name="line.364"></a>
-<span class="sourceLineNo">365</span>            fail("Failed to write " + editsCount.get());<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          }<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          break;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>        } catch (Throwable t) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          LOG.error(getName() + " HOW? " + t);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>          LOG.debug("exception details", t);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          break;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      LOG.info(getName() + " Writer exiting");<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><a name="line.377"></a>
-<span class="sourceLineNo">378</span>  /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  @Test<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    Path regiondir = new Path(tdir,<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    fs.mkdirs(regiondir);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    long now = System.currentTimeMillis();<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    Entry entry =<a name="line.389"></a>
-<span class="sourceLineNo">390</span>        new Entry(new WALKeyImpl(encoded,<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            new WALEdit());<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        FILENAME_BEING_SPLIT, conf);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.396"></a>
-<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>  /**<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   * This is useful in upgrading old instances.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   */<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  @Test<a name="line.403"></a>
-<span class="sourceLineNo">404</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    Path regiondir = new Path(tdir,<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    fs.mkdirs(regiondir);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    long now = System.currentTimeMillis();<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    Entry entry =<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        new Entry(new WALKeyImpl(encoded,<a name="line.412"></a>
-<span class="sourceLineNo">413</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.413"></a>
-<span class="sourceLineNo">414</span>            new WALEdit());<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    Path parent = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    assertEquals(HConstants.RECOVERED_EDITS_DIR, parent.getName());<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    fs.createNewFile(parent); // create a recovered.edits file<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        FILENAME_BEING_SPLIT, conf);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    WALFactory.createRecoveredEditsWriter(fs, p, conf).close();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span>  private void useDifferentDFSClient() throws IOException {<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    // make fs act as a different client now<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    // initialize will create a new DFSClient with a new client ID<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    fs.initialize(fs.getUri(), conf);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  @Test<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    final String REGION = "region__1";<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    REGIONS.clear();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    REGIONS.add(REGION);<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>    generateWALs(1, 10, -1, 0);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    useDifferentDFSClient();<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    assertEquals(1, splitLog.length);<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
+<span class="sourceLineNo">133</span>  private String TMPDIRNAME;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  private static final int NUM_WRITERS = 10;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private static final int ENTRIES = 10; // entries per writer per region<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private static final String FILENAME_BEING_SPLIT = "testfile";<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  private static final TableName TABLE_NAME =<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      TableName.valueOf("t1");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  private static final byte[] FAMILY = Bytes.toBytes("f1");<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private static final byte[] QUALIFIER = Bytes.toBytes("q1");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  private static final byte[] VALUE = Bytes.toBytes("v1");<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  private static final String WAL_FILE_PREFIX = "wal.dat.";<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static List&lt;String&gt; REGIONS = new ArrayList&lt;&gt;();<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static final String HBASE_SKIP_ERRORS = "hbase.hlog.split.skip.errors";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private static String ROBBER;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  private static String ZOMBIE;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  private static String [] GROUP = new String [] {"supergroup"};<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>  static enum Corruptions {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    INSERT_GARBAGE_ON_FIRST_LINE,<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    INSERT_GARBAGE_IN_THE_MIDDLE,<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    APPEND_GARBAGE,<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    TRUNCATE,<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    TRUNCATE_TRAILER<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>  @BeforeClass<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public static void setUpBeforeClass() throws Exception {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    conf = TEST_UTIL.getConfiguration();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    conf.setClass("hbase.regionserver.hlog.writer.impl",<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        InstrumentedLogWriter.class, Writer.class);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    // This is how you turn off shortcircuit read currently.  TODO: Fix.  Should read config.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    System.setProperty("hbase.tests.use.shortcircuit.reads", "false");<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    // Create fake maping user to group and set it to the conf.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    Map&lt;String, String []&gt; u2g_map = new HashMap&lt;&gt;(2);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    ROBBER = User.getCurrent().getName() + "-robber";<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    ZOMBIE = User.getCurrent().getName() + "-zombie";<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    u2g_map.put(ROBBER, GROUP);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    u2g_map.put(ZOMBIE, GROUP);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    DFSTestUtil.updateConfWithFakeGroupMapping(conf, u2g_map);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    conf.setInt("dfs.heartbeat.interval", 1);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    TEST_UTIL.startMiniDFSCluster(2);<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>  @AfterClass<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  public static void tearDownAfterClass() throws Exception {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    TEST_UTIL.shutdownMiniDFSCluster();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>  @Rule<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  public TestName name = new TestName();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  private WALFactory wals = null;<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  @Before<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  public void setUp() throws Exception {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    LOG.info("Cleaning up cluster for new test.");<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    fs = TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    HBASEDIR = TEST_UTIL.createRootDir();<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    HBASELOGDIR = TEST_UTIL.createWALRootDir();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    OLDLOGDIR = new Path(HBASELOGDIR, HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    CORRUPTDIR = new Path(HBASELOGDIR, HConstants.CORRUPT_DIR_NAME);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    TABLEDIR = FSUtils.getTableDir(HBASEDIR, TABLE_NAME);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    TMPDIRNAME = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    REGIONS.clear();<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    Collections.addAll(REGIONS, "bbb", "ccc");<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    InstrumentedLogWriter.activateFailure = false;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    wals = new WALFactory(conf, name.getMethodName());<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    WALDIR = new Path(HBASELOGDIR,<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        AbstractFSWALProvider.getWALDirectoryName(ServerName.valueOf(name.getMethodName(),<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            16010, System.currentTimeMillis()).toString()));<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    //fs.mkdirs(WALDIR);<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>  @After<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  public void tearDown() throws Exception {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    try {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      wals.close();<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    } catch(IOException exception) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      // Some tests will move WALs out from under us. In those cases, we'll get an error on close.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      LOG.info("Ignoring an error while closing down our WALFactory. Fine for some tests, but if" +<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          " you see a failure look here.");<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      LOG.debug("exception details", exception);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    } finally {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      wals = null;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      fs.delete(HBASEDIR, true);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      fs.delete(HBASELOGDIR, true);<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><a name="line.222"></a>
+<span class="sourceLineNo">223</span>  /**<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   * Simulates splitting a WAL out from under a regionserver that is still trying to write it.<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * Ensures we do not lose edits.<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * @throws IOException<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * @throws InterruptedException<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   */<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  @Test<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // Region we'll write edits too and then later examine to make sure they all made it in.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    final String region = REGIONS.get(0);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    final int numWriters = 3;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    Thread zombie = new ZombieLastLogWriterRegionServer(counter, stop, region, numWriters);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      long startCount = counter.get();<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      zombie.start();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      // Wait till writer starts going.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      while (startCount == counter.get()) Threads.sleep(1);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      // Give it a second to write a few appends.<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      Threads.sleep(1000);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      final Configuration conf2 = HBaseConfiguration.create(conf);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      final User robber = User.createUserForTesting(conf2, ROBBER, GROUP);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      int count = robber.runAs(new PrivilegedExceptionAction&lt;Integer&gt;() {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        public Integer run() throws Exception {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>          StringBuilder ls = new StringBuilder("Contents of WALDIR (").append(WALDIR)<a name="line.249"></a>
+<span class="sourceLineNo">250</span>              .append("):\n");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>          for (FileStatus status : fs.listStatus(WALDIR)) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>            ls.append("\t").append(status.toString()).append("\n");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>          }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>          LOG.debug(Objects.toString(ls));<a name="line.254"></a>
+<span class="sourceLineNo">255</span>          LOG.info("Splitting WALs out from under zombie. Expecting " + numWriters + " files.");<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf2, wals);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>          LOG.info("Finished splitting out from under zombie.");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>          Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>          assertEquals("wrong number of split files for region", numWriters, logfiles.length);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>          int count = 0;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>          for (Path logfile: logfiles) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>            count += countWAL(logfile);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>          }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>          return count;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>        }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      });<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      LOG.info("zombie=" + counter.get() + ", robber=" + count);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      assertTrue("The log file could have at most 1 extra log entry, but can't have less. " +<a name="line.268"></a>
+<span class="sourceLineNo">269</span>              "Zombie could write " + counter.get() + " and logfile had only " + count,<a name="line.269"></a>
+<span class="sourceLineNo">270</span>          counter.get() == count || counter.get() + 1 == count);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    } finally {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      stop.set(true);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      zombie.interrupt();<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      Threads.threadDumpingIsAlive(zombie);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>  /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   * This thread will keep writing to a 'wal' file even after the split process has started.<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   * It simulates a region server that was considered dead but woke up and wrote some more to the<a name="line.280"></a>
+<span class="sourceLineNo">281</span>   * last log entry. Does its writing as an alternate user in another filesystem instance to<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * simulate better it being a regionserver.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  class ZombieLastLogWriterRegionServer extends Thread {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    final AtomicLong editsCount;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    final AtomicBoolean stop;<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    final int numOfWriters;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    /**<a name="line.288"></a>
+<span class="sourceLineNo">289</span>     * Region to write edits for.<a name="line.289"></a>
+<span class="sourceLineNo">290</span>     */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    final String region;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    final User user;<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>    public ZombieLastLogWriterRegionServer(AtomicLong counter, AtomicBoolean stop,<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        final String region, final int writers)<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        throws IOException, InterruptedException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      super("ZombieLastLogWriterRegionServer");<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      setDaemon(true);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      this.stop = stop;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      this.editsCount = counter;<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      this.region = region;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      this.user = User.createUserForTesting(conf, ZOMBIE, GROUP);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      numOfWriters = writers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    public void run() {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      try {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        doWriting();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      } catch (IOException e) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        LOG.warn(getName() + " Writer exiting " + e);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } catch (InterruptedException e) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        LOG.warn(getName() + " Writer exiting " + e);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      }<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>    private void doWriting() throws IOException, InterruptedException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      this.user.runAs(new PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        public Object run() throws Exception {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>          // Index of the WAL we want to keep open.  generateWALs will leave open the WAL whose<a name="line.321"></a>
+<span class="sourceLineNo">322</span>          // index we supply here.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>          int walToKeepOpen = numOfWriters - 1;<a name="line.323"></a>
+<span class="sourceLineNo">324</span>          // The below method writes numOfWriters files each with ENTRIES entries for a total of<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          // numOfWriters * ENTRIES added per column family in the region.<a name="line.325"></a>
+<span class="sourceLineNo">326</span>          Writer writer = null;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>          try {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>            writer = generateWALs(numOfWriters, ENTRIES, walToKeepOpen);<a name="line.328"></a>
+<span class="sourceLineNo">329</span>          } catch (IOException e1) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            throw new RuntimeException("Failed", e1);<a name="line.330"></a>
+<span class="sourceLineNo">331</span>          }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>          // Update counter so has all edits written so far.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>          editsCount.addAndGet(numOfWriters * ENTRIES);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>          loop(writer);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>          // If we've been interruped, then things should have shifted out from under us.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>          // closing should error<a name="line.336"></a>
+<span class="sourceLineNo">337</span>          try {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>            writer.close();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>            fail("Writing closing after parsing should give an error.");<a name="line.339"></a>
+<span class="sourceLineNo">340</span>          } catch (IOException exception) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>            LOG.debug("ignoring error when closing final writer.", exception);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>          }<a name="line.342"></a>
+<span class="sourceLineNo">343</span>          return null;<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><a name="line.347"></a>
+<span class="sourceLineNo">348</span>    private void loop(final Writer writer) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      byte [] regionBytes = Bytes.toBytes(this.region);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      while (!stop.get()) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>          long seq = appendEntry(writer, TABLE_NAME, regionBytes,<a name="line.352"></a>
+<span class="sourceLineNo">353</span>              Bytes.toBytes("r" + editsCount.get()), regionBytes, QUALIFIER, VALUE, 0);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>          long count = editsCount.incrementAndGet();<a name="line.354"></a>
+<span class="sourceLineNo">355</span>          LOG.info(getName() + " sync count=" + count + ", seq=" + seq);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          try {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            Thread.sleep(1);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>          } catch (InterruptedException e) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>            //<a name="line.359"></a>
+<span class="sourceLineNo">360</span>          }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        } catch (IOException ex) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          LOG.error(getName() + " ex " + ex.toString());<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (ex instanceof RemoteException) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            LOG.error("Juliet: got RemoteException " + ex.getMessage() +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                " while writing " + (editsCount.get() + 1));<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          } else {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>            LOG.error(getName() + " failed to write....at " + editsCount.get());<a name="line.367"></a>
+<span class="sourceLineNo">368</span>            fail("Failed to write " + editsCount.get());<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          break;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        } catch (Throwable t) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          LOG.error(getName() + " HOW? " + t);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>          LOG.debug("exception details", t);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          break;<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>      LOG.info(getName() + " Writer exiting");<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><a name="line.380"></a>
+<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  @Test<a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    Path regiondir = new Path(tdir,<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    fs.mkdirs(regiondir);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    long now = System.currentTimeMillis();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    Entry entry =<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        new Entry(new WALKeyImpl(encoded,<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            new WALEdit());<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.396"></a>
+<span class="sourceLineNo">397</span>        FILENAME_BEING_SPLIT, TMPDIRNAME, conf);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.399"></a>
+<span class="sourceLineNo">400</span>  }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>  /**<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   * This is useful in upgrading old instances.<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   */<a name="line.405"></a>
+<span class="sourceLineNo">406</span>  @Test<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    Path regiondir = new Path(tdir,<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    fs.mkdirs(regiondir);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    long now = System.currentTimeMillis();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    Entry entry =<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        new Entry(new WALKeyImpl(encoded,<a name="line.415"></a>
+<span class="sourceLineNo">416</span>            TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),<a name="line.416"></a>
+<span class="sourceLineNo">417</span>            new WALEdit());<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    Path parent = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    assertEquals(HConstants.RECOVERED_EDITS_DIR, parent.getName());<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    fs.createNewFile(parent); // create a recovered.edits file<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>    Path p = WALSplitter.getRegionSplitEditsPath(entry,<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        FILENAME_BEING_SPLIT, TMPDIRNAME, conf);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    String parentOfParent = p.getParent().getParent().getName();<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    assertEquals(parentOfParent, RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedName());<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    WALFactory.createRecoveredEditsWriter(fs, p, conf).close();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>  private void useDifferentDFSClient() throws IOException {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    // make fs act as a different client now<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    // initialize will create a new DFSClient with a new client ID<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    fs.initialize(fs.getUri(), conf);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  @Test<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    final String REGION = "region__1";<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    REGIONS.clear();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    REGIONS.add(REGION);<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    generateWALs(1, 10, -1, 0);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    useDifferentDFSClient();<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    assertEquals(1, splitLog.length);<a name="line.446"></a>
 <span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  @Test<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    final String REGION = "region__1";<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    REGIONS.clear();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    REGIONS.add(REGION);<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span>    generateWALs(1, 10, -1, 100);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    useDifferentDFSClient();<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    assertEquals(1, splitLog.length);<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    // split log should only have the test edits<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    assertEquals(10, countWAL(splitLog[0]));<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @Test<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    REGIONS.clear();<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    REGIONS.add(hri.getEncodedName());<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    Path regionDir = new Path(FSUtils.getTableDir(HBASEDIR, TABLE_NAME), hri.getEncodedName());<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    LOG.info("Creating region directory: " + regionDir);<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    assertTrue(fs.mkdirs(regionDir));<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span>    Writer writer = generateWALs(1, 10, 0, 10);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    String[] compactInputs = new String[]{"file1", "file2", "file3"};<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    String compactOutput = "file4";<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    appendCompactionEvent(writer, hri, compactInputs, compactOutput);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    writer.close();<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    useDifferentDFSClient();<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.483"></a>
+<span class="sourceLineNo">448</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.448"></a>
+<span class="sourceLineNo">449</span>  }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span>  @Test<a name="line.451"></a>
+<span class="sourceLineNo">452</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    final String REGION = "region__1";<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    REGIONS.clear();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    REGIONS.add(REGION);<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>    generateWALs(1, 10, -1, 100);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    useDifferentDFSClient();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, REGION);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    assertEquals(1, splitLog.length);<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    // split log should only have the test edits<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    assertEquals(10, countWAL(splitLog[0]));<a name="line.466"></a>
+<span class="sourceLineNo">467</span>  }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>  @Test<a name="line.470"></a>
+<span class="sourceLineNo">471</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    REGIONS.clear();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    REGIONS.add(hri.getEncodedName());<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    Path regionDir = new Path(FSUtils.getTableDir(HBASEDIR, TABLE_NAME), hri.getEncodedName());<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    LOG.info("Creating region directory: " + regionDir);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    assertTrue(fs.mkdirs(regionDir));<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    Writer writer = generateWALs(1, 10, 0, 10);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    String[] compactInputs = new String[]{"file1", "file2", "file3"};<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    String compactOutput = "file4";<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    appendCompactionEvent(writer, hri, compactInputs, compactOutput);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    writer.close();<a name="line.483"></a>
 <span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    // original log should have 10 test edits, 10 region markers, 1 compaction marker<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    assertEquals(21, countWAL(originalLog));<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, hri.getEncodedName());<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    assertEquals(1, splitLog.length);<a name="line.490"></a>
+<span class="sourceLineNo">485</span>    useDifferentDFSClient();<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    Path originalLog = (fs.listStatus(OLDLOGDIR))[0].getPath();<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    // original log should have 10 test edits, 10 region markers, 1 compaction marker<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    assertEquals(21, countWAL(originalLog));<a name="line.490"></a>
 <span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    // split log should have 10 test edits plus 1 compaction marker<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    assertEquals(11, countWAL(splitLog[0]));<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>  /**<a name="line.497"></a>
-<span class="sourceLineNo">498</span>   * @param expectedEntries -1 to not assert<a name="line.498"></a>
-<span class="sourceLineNo">499</span>   * @return the count across all regions<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>  private int splitAndCount(final int expectedFiles, final int expectedEntries)<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      throws IOException {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    useDifferentDFSClient();<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    int result = 0;<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    for (String region : REGIONS) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      assertEquals(expectedFiles, logfiles.length);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      int count = 0;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      for (Path logfile: logfiles) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        count += countWAL(logfile);<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      if (-1 != expectedEntries) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>        assertEquals(expectedEntries, count);<a name="line.514"></a>
+<span class="sourceLineNo">492</span>    Path[] splitLog = getLogForRegion(HBASEDIR, TABLE_NAME, hri.getEncodedName());<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    assertEquals(1, splitLog.length);<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span>    assertFalse("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    // split log should have 10 test edits plus 1 compaction marker<a name="line.496"></a>
+<span class="sourceLineNo">497</span>    assertEquals(11, countWAL(splitLog[0]));<a name="line.497"></a>
+<span class="sourceLineNo">498</span>  }<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>  /**<a name="line.500"></a>
+<span class="sourceLineNo">501</span>   * @param expectedEntries -1 to not assert<a name="line.501"></a>
+<span class="sourceLineNo">502</span>   * @return the count across all regions<a name="line.502"></a>
+<span class="sourceLineNo">503</span>   */<a name="line.503"></a>
+<span class="sourceLineNo">504</span>  private int splitAndCount(final int expectedFiles, final int expectedEntries)<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      throws IOException {<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    useDifferentDFSClient();<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    WALSplitter.split(HBASEDIR, WALDIR, OLDLOGDIR, fs, conf, wals);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    int result = 0;<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    for (String region : REGIONS) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      Path[] logfiles = getLogForRegion(HBASEDIR, TABLE_NAME, region);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      assertEquals(expectedFiles, logfiles.length);<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      int count = 0;<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      for (Path logfile: logfiles) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        count += countWAL(logfile);<a name="line.514"></a>
 <span class="sourceLineNo">515</span>      }<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      result += count;<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    }<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    return result;<a name="line.518"></a>
-<span class="sourceLineNo">519</span>  }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>  @Test<a name="line.521"></a>
-<span class="sourceLineNo">522</span>  public void testEmptyLogFiles() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    testEmptyLogFiles(true);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>  }<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  @Test<a name="line.526"></a>
-<span class="sourceLineNo">527</span>  public void testEmptyOpenLogFiles() throws IOException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    testEmptyLogFiles(false);<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>  private void testEmptyLogFiles(final boolean close) throws IOException {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    // we won't create the hlog dir until getWAL got called, so<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    // make dir here when testing empty log file<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    fs.mkdirs(WALDIR);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    injectEmptyFile(".empty", close);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    generateWALs(Integer.MAX_VALUE);<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    injectEmptyFile("empty", close);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); // skip 2 empty<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>  @Test<a name="line.541"></a>
-<span class="sourceLineNo">542</span>  public void testOpenZeroLengthReportedFileButWithDataGetsSplit() throws IOException {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    // generate logs but leave wal.dat.5 open.<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    generateWALs(5);<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.545"></a>
-<span class="sourceLineNo">546</span>  }<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>  @Test<a name="line.548"></a>
-<span class="sourceLineNo">549</span>  public void testTralingGarbageCorruptionFileSkipErrorsPasses() throws IOException {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    generateWALs(Integer.MAX_VALUE);<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    corruptWAL(new Path(WALDIR, WAL_FILE_PREFIX + "5"),<a name="line.552"></a>
-<span class="sourceLineNo">553</span>        Corruptions.APPEND_GARBAGE, true);<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  @Test<a name="line.557"></a>
-<span class="sourceLineNo">558</span>  public void testFirstLineCorruptionLogFileSkipErrorsPasses() throws IOException {<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    generateWALs(Integer.MAX_VALUE);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    corruptWAL(new Path(WALDIR, WAL_FILE_PREFIX + "5"),<a name="line.561"></a>
-<span class="sourceLineNo">562</span>        Corruptions.INSERT_GARBAGE_ON_FIRST_LINE, true);<a name="line.562"></a>
-<span class="sourceLineNo">563</span>    splitAndCount(NUM_WRITERS - 1, (NUM_WRITERS - 1) * ENTRIES); //1 corrupt<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>  @Test<a name="line.566"></a>
-<span class="sourceLineNo">567</span>  public void testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    generateWALs(Integer.MAX_VALUE);<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    corruptWAL(new Path(WALDIR, WAL_FILE_PREFIX + "5"),<a name="line.570"></a>
-<span class="sourceLineNo">571</span>        Corruptions.INSERT_GARBAGE_IN_THE_MIDDLE, false);<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    // the entries in the original logs are alternating regions<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    // considering the sequence file header, the middle corruption should<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    // affect at least half of the entries<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    int goodEntries = (NUM_WRITERS - 1) * ENTRIES;<a name="line.575"></a>
-<span class="sourceLineNo">576</span>    int firstHalfEntries = (int) Math.ceil(ENTRIES / 2) - 1;<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    int allRegionsCount = splitAndCount(NUM_WRITERS, -1);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    assertTrue("The file up to the corrupted area hasn't been parsed",<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        REGIONS.size() * (goodEntries + firstHalfEntries) &lt;= allRegionsCount);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>  }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  public void testCorruptedFileGetsArchivedIfSkipErrors() throws IOException {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    List&lt;FaultyProtobufLogReader.FailureType&gt; failureTypes = Arrays<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        .asList(FaultyProtobufLogReader.FailureType.values()).stream()<a name="line.586"></a>
-<span class="sourceLineNo">587</span>        .filter(x -&gt; x != FaultyProtobufLogReader.FailureType.NONE).collect(Collectors.toList());<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    for (FaultyProtobufLogReader.FailureType failureType : failureTypes) {<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      final Set&lt;String&gt; walDirContents = splitCorruptWALs(failureType);<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      final Set&lt;String&gt; archivedLogs = new HashSet&lt;&gt;();<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      final StringBuilder archived = new StringBuilder("Archived logs in CORRUPTDIR:");<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      for (FileStatus log : fs.listStatus(CORRUPTDIR)) {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>        archived.append("\n\t").append(log.toString());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        archivedLogs.add(log.getPath().getName());<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      LOG.debug(archived.toString());<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      assertEquals(failureType.name() + ": expected to find all of our wals corrupt.", archivedLogs,<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          walDirContents);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    }<a name="line.599"></a>
-<span class="sourceLineNo">600</span>  }<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span>  /**<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   * @return set of wal names present prior to split attempt.<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * @throws IOException if the split process fails<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   */<a name="line.605"></a>
-<span class="sourceLineNo">606</span>  private Set&lt;String&gt; splitCorruptWALs(final FaultyProtobufLogReader.FailureType failureType)<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      throws IOException {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Class&lt;?&gt; backupClass = conf.getClass("hbase.regionserver.hlog.reader.impl",<a name="line.608"></a>
-<span class="sourceLineNo">609</span>        Reader.class);<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    InstrumentedLogWriter.activateFailure = false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span><a name="line.611"></a>
-<span class="sourceLineNo">612</span>    try {<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      conf.setClass("hbase.regionserver.hlog.reader.impl", FaultyProtobufLogReader.class,<a name="line.613"></a>
-<span class="sourceLineNo">614</span>        Reader.class);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      conf.set("faultyprotobuflogreader.failuretype", failureType.name());<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      // Clean up from previous tests or previous loop<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      try {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        wals.shutdown();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      } catch (IOException exception) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        // since we're splitting out from under the factory, we should expect some closing failures.<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        LOG.debug("Ignoring problem closing WALFactory.", exception);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      wals.close();<a name="line.623"></a>
-<span class="sourceLineNo">624</span>      try {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        for (FileStatus log : fs.listStatus(CORRUPTDIR)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>          fs.delete(log.getPath(), true);<a name="line.626"></a>
-<span class="sourceLineNo">627</span>        }<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      } catch (FileNotFoundException exception) {<a name="line.628"></a>
-<span class="sourceLineNo">629</span>        LOG.debug("no previous CORRUPTDIR to clean.");<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      }<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      // change to the 

<TRUNCATED>

[20/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.html
index 6086d40..3cfacfc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.html
@@ -903,103 +903,108 @@
 <span class="sourceLineNo">895</span>      return;<a name="line.895"></a>
 <span class="sourceLineNo">896</span>    }<a name="line.896"></a>
 <span class="sourceLineNo">897</span><a name="line.897"></a>
-<span class="sourceLineNo">898</span>    LOG.debug("{} held the lock before restarting, call acquireLock to restore it.", this);<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    LockState state = acquireLock(env);<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    assert state == LockState.LOCK_ACQUIRED;<a name="line.900"></a>
-<span class="sourceLineNo">901</span>  }<a name="line.901"></a>
+<span class="sourceLineNo">898</span>    if (isFinished()) {<a name="line.898"></a>
+<span class="sourceLineNo">899</span>      LOG.debug("{} is already finished, skip acquiring lock.", this);<a name="line.899"></a>
+<span class="sourceLineNo">900</span>      return;<a name="line.900"></a>
+<span class="sourceLineNo">901</span>    }<a name="line.901"></a>
 <span class="sourceLineNo">902</span><a name="line.902"></a>
-<span class="sourceLineNo">903</span>  /**<a name="line.903"></a>
-<span class="sourceLineNo">904</span>   * Internal method called by the ProcedureExecutor that starts the user-level code acquireLock().<a name="line.904"></a>
-<span class="sourceLineNo">905</span>   */<a name="line.905"></a>
-<span class="sourceLineNo">906</span>  final LockState doAcquireLock(TEnvironment env, ProcedureStore store) {<a name="line.906"></a>
-<span class="sourceLineNo">907</span>    if (waitInitialized(env)) {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      return LockState.LOCK_EVENT_WAIT;<a name="line.908"></a>
-<span class="sourceLineNo">909</span>    }<a name="line.909"></a>
-<span class="sourceLineNo">910</span>    if (lockedWhenLoading) {<a name="line.910"></a>
-<span class="sourceLineNo">911</span>      // reset it so we will not consider it anymore<a name="line.911"></a>
-<span class="sourceLineNo">912</span>      lockedWhenLoading = false;<a name="line.912"></a>
-<span class="sourceLineNo">913</span>      locked = true;<a name="line.913"></a>
-<span class="sourceLineNo">914</span>      // Here we return without persist the locked state, as lockedWhenLoading is true means<a name="line.914"></a>
-<span class="sourceLineNo">915</span>      // that the locked field of the procedure stored in procedure store is true, so we do not need<a name="line.915"></a>
-<span class="sourceLineNo">916</span>      // to store it again.<a name="line.916"></a>
-<span class="sourceLineNo">917</span>      return LockState.LOCK_ACQUIRED;<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    }<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    LockState state = acquireLock(env);<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    if (state == LockState.LOCK_ACQUIRED) {<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      locked = true;<a name="line.921"></a>
-<span class="sourceLineNo">922</span>      // persist that we have held the lock. This must be done before we actually execute the<a name="line.922"></a>
-<span class="sourceLineNo">923</span>      // procedure, otherwise when restarting, we may consider the procedure does not have a lock,<a name="line.923"></a>
-<span class="sourceLineNo">924</span>      // but it may have already done some changes as we have already executed it, and if another<a name="line.924"></a>
-<span class="sourceLineNo">925</span>      // procedure gets the lock, then the semantic will be broken if the holdLock is true, as we do<a name="line.925"></a>
-<span class="sourceLineNo">926</span>      // not expect that another procedure can be executed in the middle.<a name="line.926"></a>
-<span class="sourceLineNo">927</span>      store.update(this);<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    }<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    return state;<a name="line.929"></a>
-<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span>  /**<a name="line.932"></a>
-<span class="sourceLineNo">933</span>   * Internal method called by the ProcedureExecutor that starts the user-level code releaseLock().<a name="line.933"></a>
-<span class="sourceLineNo">934</span>   */<a name="line.934"></a>
-<span class="sourceLineNo">935</span>  final void doReleaseLock(TEnvironment env, ProcedureStore store) {<a name="line.935"></a>
-<span class="sourceLineNo">936</span>    locked = false;<a name="line.936"></a>
-<span class="sourceLineNo">937</span>    // persist that we have released the lock. This must be done before we actually release the<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    // lock. Another procedure may take this lock immediately after we release the lock, and if we<a name="line.938"></a>
-<span class="sourceLineNo">939</span>    // crash before persist the information that we have already released the lock, then when<a name="line.939"></a>
-<span class="sourceLineNo">940</span>    // restarting there will be two procedures which both have the lock and cause problems.<a name="line.940"></a>
-<span class="sourceLineNo">941</span>    if (getState() != ProcedureState.ROLLEDBACK) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>      // If the state is ROLLEDBACK, it means that we have already deleted the procedure from<a name="line.942"></a>
-<span class="sourceLineNo">943</span>      // procedure store, so do not need to log the release operation any more.<a name="line.943"></a>
-<span class="sourceLineNo">944</span>      store.update(this);<a name="line.944"></a>
-<span class="sourceLineNo">945</span>    }<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    releaseLock(env);<a name="line.946"></a>
-<span class="sourceLineNo">947</span>  }<a name="line.947"></a>
-<span class="sourceLineNo">948</span><a name="line.948"></a>
-<span class="sourceLineNo">949</span>  @Override<a name="line.949"></a>
-<span class="sourceLineNo">950</span>  public int compareTo(final Procedure&lt;TEnvironment&gt; other) {<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    return Long.compare(getProcId(), other.getProcId());<a name="line.951"></a>
+<span class="sourceLineNo">903</span>    LOG.debug("{} held the lock before restarting, call acquireLock to restore it.", this);<a name="line.903"></a>
+<span class="sourceLineNo">904</span>    LockState state = acquireLock(env);<a name="line.904"></a>
+<span class="sourceLineNo">905</span>    assert state == LockState.LOCK_ACQUIRED;<a name="line.905"></a>
+<span class="sourceLineNo">906</span>  }<a name="line.906"></a>
+<span class="sourceLineNo">907</span><a name="line.907"></a>
+<span class="sourceLineNo">908</span>  /**<a name="line.908"></a>
+<span class="sourceLineNo">909</span>   * Internal method called by the ProcedureExecutor that starts the user-level code acquireLock().<a name="line.909"></a>
+<span class="sourceLineNo">910</span>   */<a name="line.910"></a>
+<span class="sourceLineNo">911</span>  final LockState doAcquireLock(TEnvironment env, ProcedureStore store) {<a name="line.911"></a>
+<span class="sourceLineNo">912</span>    if (waitInitialized(env)) {<a name="line.912"></a>
+<span class="sourceLineNo">913</span>      return LockState.LOCK_EVENT_WAIT;<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    }<a name="line.914"></a>
+<span class="sourceLineNo">915</span>    if (lockedWhenLoading) {<a name="line.915"></a>
+<span class="sourceLineNo">916</span>      // reset it so we will not consider it anymore<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      lockedWhenLoading = false;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>      locked = true;<a name="line.918"></a>
+<span class="sourceLineNo">919</span>      // Here we return without persist the locked state, as lockedWhenLoading is true means<a name="line.919"></a>
+<span class="sourceLineNo">920</span>      // that the locked field of the procedure stored in procedure store is true, so we do not need<a name="line.920"></a>
+<span class="sourceLineNo">921</span>      // to store it again.<a name="line.921"></a>
+<span class="sourceLineNo">922</span>      return LockState.LOCK_ACQUIRED;<a name="line.922"></a>
+<span class="sourceLineNo">923</span>    }<a name="line.923"></a>
+<span class="sourceLineNo">924</span>    LockState state = acquireLock(env);<a name="line.924"></a>
+<span class="sourceLineNo">925</span>    if (state == LockState.LOCK_ACQUIRED) {<a name="line.925"></a>
+<span class="sourceLineNo">926</span>      locked = true;<a name="line.926"></a>
+<span class="sourceLineNo">927</span>      // persist that we have held the lock. This must be done before we actually execute the<a name="line.927"></a>
+<span class="sourceLineNo">928</span>      // procedure, otherwise when restarting, we may consider the procedure does not have a lock,<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      // but it may have already done some changes as we have already executed it, and if another<a name="line.929"></a>
+<span class="sourceLineNo">930</span>      // procedure gets the lock, then the semantic will be broken if the holdLock is true, as we do<a name="line.930"></a>
+<span class="sourceLineNo">931</span>      // not expect that another procedure can be executed in the middle.<a name="line.931"></a>
+<span class="sourceLineNo">932</span>      store.update(this);<a name="line.932"></a>
+<span class="sourceLineNo">933</span>    }<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    return state;<a name="line.934"></a>
+<span class="sourceLineNo">935</span>  }<a name="line.935"></a>
+<span class="sourceLineNo">936</span><a name="line.936"></a>
+<span class="sourceLineNo">937</span>  /**<a name="line.937"></a>
+<span class="sourceLineNo">938</span>   * Internal method called by the ProcedureExecutor that starts the user-level code releaseLock().<a name="line.938"></a>
+<span class="sourceLineNo">939</span>   */<a name="line.939"></a>
+<span class="sourceLineNo">940</span>  final void doReleaseLock(TEnvironment env, ProcedureStore store) {<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    locked = false;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    // persist that we have released the lock. This must be done before we actually release the<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    // lock. Another procedure may take this lock immediately after we release the lock, and if we<a name="line.943"></a>
+<span class="sourceLineNo">944</span>    // crash before persist the information that we have already released the lock, then when<a name="line.944"></a>
+<span class="sourceLineNo">945</span>    // restarting there will be two procedures which both have the lock and cause problems.<a name="line.945"></a>
+<span class="sourceLineNo">946</span>    if (getState() != ProcedureState.ROLLEDBACK) {<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      // If the state is ROLLEDBACK, it means that we have already deleted the procedure from<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      // procedure store, so do not need to log the release operation any more.<a name="line.948"></a>
+<span class="sourceLineNo">949</span>      store.update(this);<a name="line.949"></a>
+<span class="sourceLineNo">950</span>    }<a name="line.950"></a>
+<span class="sourceLineNo">951</span>    releaseLock(env);<a name="line.951"></a>
 <span class="sourceLineNo">952</span>  }<a name="line.952"></a>
 <span class="sourceLineNo">953</span><a name="line.953"></a>
-<span class="sourceLineNo">954</span>  // ==========================================================================<a name="line.954"></a>
-<span class="sourceLineNo">955</span>  //  misc utils<a name="line.955"></a>
-<span class="sourceLineNo">956</span>  // ==========================================================================<a name="line.956"></a>
-<span class="sourceLineNo">957</span><a name="line.957"></a>
-<span class="sourceLineNo">958</span>  /**<a name="line.958"></a>
-<span class="sourceLineNo">959</span>   * Get an hashcode for the specified Procedure ID<a name="line.959"></a>
-<span class="sourceLineNo">960</span>   * @return the hashcode for the specified procId<a name="line.960"></a>
-<span class="sourceLineNo">961</span>   */<a name="line.961"></a>
-<span class="sourceLineNo">962</span>  public static long getProcIdHashCode(long procId) {<a name="line.962"></a>
-<span class="sourceLineNo">963</span>    long h = procId;<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    h ^= h &gt;&gt; 16;<a name="line.964"></a>
-<span class="sourceLineNo">965</span>    h *= 0x85ebca6b;<a name="line.965"></a>
-<span class="sourceLineNo">966</span>    h ^= h &gt;&gt; 13;<a name="line.966"></a>
-<span class="sourceLineNo">967</span>    h *= 0xc2b2ae35;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>    h ^= h &gt;&gt; 16;<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    return h;<a name="line.969"></a>
-<span class="sourceLineNo">970</span>  }<a name="line.970"></a>
-<span class="sourceLineNo">971</span><a name="line.971"></a>
-<span class="sourceLineNo">972</span>  /**<a name="line.972"></a>
-<span class="sourceLineNo">973</span>   * Helper to lookup the root Procedure ID given a specified procedure.<a name="line.973"></a>
-<span class="sourceLineNo">974</span>   */<a name="line.974"></a>
-<span class="sourceLineNo">975</span>  protected static &lt;T&gt; Long getRootProcedureId(Map&lt;Long, Procedure&lt;T&gt;&gt; procedures,<a name="line.975"></a>
-<span class="sourceLineNo">976</span>      Procedure&lt;T&gt; proc) {<a name="line.976"></a>
-<span class="sourceLineNo">977</span>    while (proc.hasParent()) {<a name="line.977"></a>
-<span class="sourceLineNo">978</span>      proc = procedures.get(proc.getParentProcId());<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      if (proc == null) {<a name="line.979"></a>
-<span class="sourceLineNo">980</span>        return null;<a name="line.980"></a>
-<span class="sourceLineNo">981</span>      }<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    }<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    return proc.getProcId();<a name="line.983"></a>
-<span class="sourceLineNo">984</span>  }<a name="line.984"></a>
-<span class="sourceLineNo">985</span><a name="line.985"></a>
-<span class="sourceLineNo">986</span>  /**<a name="line.986"></a>
-<span class="sourceLineNo">987</span>   * @param a the first procedure to be compared.<a name="line.987"></a>
-<span class="sourceLineNo">988</span>   * @param b the second procedure to be compared.<a name="line.988"></a>
-<span class="sourceLineNo">989</span>   * @return true if the two procedures have the same parent<a name="line.989"></a>
-<span class="sourceLineNo">990</span>   */<a name="line.990"></a>
-<span class="sourceLineNo">991</span>  public static boolean haveSameParent(Procedure&lt;?&gt; a, Procedure&lt;?&gt; b) {<a name="line.991"></a>
-<span class="sourceLineNo">992</span>    return a.hasParent() &amp;&amp; b.hasParent() &amp;&amp; (a.getParentProcId() == b.getParentProcId());<a name="line.992"></a>
-<span class="sourceLineNo">993</span>  }<a name="line.993"></a>
-<span class="sourceLineNo">994</span>}<a name="line.994"></a>
+<span class="sourceLineNo">954</span>  @Override<a name="line.954"></a>
+<span class="sourceLineNo">955</span>  public int compareTo(final Procedure&lt;TEnvironment&gt; other) {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>    return Long.compare(getProcId(), other.getProcId());<a name="line.956"></a>
+<span class="sourceLineNo">957</span>  }<a name="line.957"></a>
+<span class="sourceLineNo">958</span><a name="line.958"></a>
+<span class="sourceLineNo">959</span>  // ==========================================================================<a name="line.959"></a>
+<span class="sourceLineNo">960</span>  //  misc utils<a name="line.960"></a>
+<span class="sourceLineNo">961</span>  // ==========================================================================<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span>  /**<a name="line.963"></a>
+<span class="sourceLineNo">964</span>   * Get an hashcode for the specified Procedure ID<a name="line.964"></a>
+<span class="sourceLineNo">965</span>   * @return the hashcode for the specified procId<a name="line.965"></a>
+<span class="sourceLineNo">966</span>   */<a name="line.966"></a>
+<span class="sourceLineNo">967</span>  public static long getProcIdHashCode(long procId) {<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    long h = procId;<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    h ^= h &gt;&gt; 16;<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    h *= 0x85ebca6b;<a name="line.970"></a>
+<span class="sourceLineNo">971</span>    h ^= h &gt;&gt; 13;<a name="line.971"></a>
+<span class="sourceLineNo">972</span>    h *= 0xc2b2ae35;<a name="line.972"></a>
+<span class="sourceLineNo">973</span>    h ^= h &gt;&gt; 16;<a name="line.973"></a>
+<span class="sourceLineNo">974</span>    return h;<a name="line.974"></a>
+<span class="sourceLineNo">975</span>  }<a name="line.975"></a>
+<span class="sourceLineNo">976</span><a name="line.976"></a>
+<span class="sourceLineNo">977</span>  /**<a name="line.977"></a>
+<span class="sourceLineNo">978</span>   * Helper to lookup the root Procedure ID given a specified procedure.<a name="line.978"></a>
+<span class="sourceLineNo">979</span>   */<a name="line.979"></a>
+<span class="sourceLineNo">980</span>  protected static &lt;T&gt; Long getRootProcedureId(Map&lt;Long, Procedure&lt;T&gt;&gt; procedures,<a name="line.980"></a>
+<span class="sourceLineNo">981</span>      Procedure&lt;T&gt; proc) {<a name="line.981"></a>
+<span class="sourceLineNo">982</span>    while (proc.hasParent()) {<a name="line.982"></a>
+<span class="sourceLineNo">983</span>      proc = procedures.get(proc.getParentProcId());<a name="line.983"></a>
+<span class="sourceLineNo">984</span>      if (proc == null) {<a name="line.984"></a>
+<span class="sourceLineNo">985</span>        return null;<a name="line.985"></a>
+<span class="sourceLineNo">986</span>      }<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    }<a name="line.987"></a>
+<span class="sourceLineNo">988</span>    return proc.getProcId();<a name="line.988"></a>
+<span class="sourceLineNo">989</span>  }<a name="line.989"></a>
+<span class="sourceLineNo">990</span><a name="line.990"></a>
+<span class="sourceLineNo">991</span>  /**<a name="line.991"></a>
+<span class="sourceLineNo">992</span>   * @param a the first procedure to be compared.<a name="line.992"></a>
+<span class="sourceLineNo">993</span>   * @param b the second procedure to be compared.<a name="line.993"></a>
+<span class="sourceLineNo">994</span>   * @return true if the two procedures have the same parent<a name="line.994"></a>
+<span class="sourceLineNo">995</span>   */<a name="line.995"></a>
+<span class="sourceLineNo">996</span>  public static boolean haveSameParent(Procedure&lt;?&gt; a, Procedure&lt;?&gt; b) {<a name="line.996"></a>
+<span class="sourceLineNo">997</span>    return a.hasParent() &amp;&amp; b.hasParent() &amp;&amp; (a.getParentProcId() == b.getParentProcId());<a name="line.997"></a>
+<span class="sourceLineNo">998</span>  }<a name="line.998"></a>
+<span class="sourceLineNo">999</span>}<a name="line.999"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
index 8b4de07..493a0e1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPrettyPrinter.html
@@ -40,163 +40,167 @@
 <span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
 <span class="sourceLineNo">034</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.procedure2.ProcedureUtil;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALEntry;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALHeader;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.util.Tool;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.util.ToolRunner;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.Options;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.ParseException;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.PosixParser;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * ProcedureWALPrettyPrinter prints the contents of a given ProcedureWAL file<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@InterfaceStability.Evolving<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class ProcedureWALPrettyPrinter extends Configured implements Tool {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private final PrintStream out;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public ProcedureWALPrettyPrinter() {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    out = System.out;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.Logger;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.slf4j.LoggerFactory;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.procedure2.ProcedureUtil;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALEntry;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureWALHeader;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.util.Tool;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.util.ToolRunner;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.Options;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.ParseException;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.PosixParser;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * ProcedureWALPrettyPrinter prints the contents of a given ProcedureWAL file<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@InterfaceStability.Evolving<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class ProcedureWALPrettyPrinter extends Configured implements Tool {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private static final Logger LOG = LoggerFactory.getLogger(ProcedureWALPrettyPrinter.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private final PrintStream out;<a name="line.58"></a>
 <span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * Reads a log file and outputs its contents.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   *<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * @param conf   HBase configuration relevant to this log file<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @param p       path of the log file to be read<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * @throws IOException  IOException<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public void processFile(final Configuration conf, final Path p)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      throws IOException {<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>    FileSystem fs = p.getFileSystem(conf);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    if (!fs.exists(p)) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      System.err.println("ERROR, file doesnt exist: " + p);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      return;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    }<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    if (!fs.isFile(p)) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      System.err.println(p + " is not a file");<a name="line.76"></a>
+<span class="sourceLineNo">060</span>  public ProcedureWALPrettyPrinter() {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    out = System.out;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * Reads a log file and outputs its contents.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   *<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param conf   HBase configuration relevant to this log file<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * @param p       path of the log file to be read<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * @throws IOException  IOException<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public void processFile(final Configuration conf, final Path p)<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      throws IOException {<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>    FileSystem fs = p.getFileSystem(conf);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    if (!fs.exists(p)) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      System.err.println("ERROR, file doesnt exist: " + p);<a name="line.76"></a>
 <span class="sourceLineNo">077</span>      return;<a name="line.77"></a>
 <span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>    FileStatus logFile = fs.getFileStatus(p);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    if (logFile.getLen() == 0) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      out.println("Zero length file: " + p);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      return;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>    out.println("Opening procedure state-log: " + p);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    ProcedureWALFile log = new ProcedureWALFile(fs, logFile);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    processProcedureWALFile(log);<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 processProcedureWALFile(ProcedureWALFile log) throws IOException {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    log.open();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    ProcedureWALHeader header = log.getHeader();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    printHeader(header);<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>    FSDataInputStream stream = log.getStream();<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    try {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      boolean hasMore = true;<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      while (hasMore) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        ProcedureWALEntry entry = ProcedureWALFormat.readEntry(stream);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        if (entry == null) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>          out.println("No more entry, exiting with missing EOF");<a name="line.102"></a>
-<span class="sourceLineNo">103</span>          hasMore = false;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>          break;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        switch (entry.getType()) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>          case PROCEDURE_WAL_EOF:<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            hasMore = false;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            break;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>          default:<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            printEntry(entry);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    } catch (IOException e) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      out.println("got an exception while reading the procedure WAL " + e.getMessage());<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    finally {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      log.close();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>  private void printEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    out.println("EntryType=" + entry.getType());<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    int procCount = entry.getProcedureCount();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    for (int i = 0; i &lt; procCount; i++) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      Procedure&lt;?&gt; proc = ProcedureUtil.convertToProcedure(entry.getProcedure(i));<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      printProcedure(proc);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  private void printProcedure(Procedure&lt;?&gt; proc) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    out.println(proc.toStringDetails());<a name="line.132"></a>
+<span class="sourceLineNo">079</span>    if (!fs.isFile(p)) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      System.err.println(p + " is not a file");<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      return;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>    FileStatus logFile = fs.getFileStatus(p);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    if (logFile.getLen() == 0) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      out.println("Zero length file: " + p);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      return;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>    out.println("Opening procedure state-log: " + p);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    ProcedureWALFile log = new ProcedureWALFile(fs, logFile);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    processProcedureWALFile(log);<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>  public void processProcedureWALFile(ProcedureWALFile log) throws IOException {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    log.open();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    ProcedureWALHeader header = log.getHeader();<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    printHeader(header);<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>    FSDataInputStream stream = log.getStream();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    try {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      boolean hasMore = true;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      while (hasMore) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        ProcedureWALEntry entry = ProcedureWALFormat.readEntry(stream);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        if (entry == null) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>          out.println("No more entry, exiting with missing EOF");<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          hasMore = false;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>          break;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        }<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        switch (entry.getType()) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>          case PROCEDURE_WAL_EOF:<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            hasMore = false;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            break;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>          default:<a name="line.114"></a>
+<span class="sourceLineNo">115</span>            printEntry(entry);<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>    } catch (IOException e) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      out.println("got an exception while reading the procedure WAL " + e.getMessage());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    finally {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      log.close();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  private void printEntry(final ProcedureWALEntry entry) throws IOException {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    out.println("EntryType=" + entry.getType());<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    int procCount = entry.getProcedureCount();<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    for (int i = 0; i &lt; procCount; i++) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      Procedure&lt;?&gt; proc = ProcedureUtil.convertToProcedure(entry.getProcedure(i));<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      printProcedure(proc);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
 <span class="sourceLineNo">133</span>  }<a name="line.133"></a>
 <span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>  private void printHeader(ProcedureWALHeader header) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    out.println("ProcedureWALHeader: ");<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    out.println("  Version: " + header.getVersion());<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    out.println("  Type: " + header.getType());<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    out.println("  LogId: " + header.getLogId());<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    out.println("  MinProcId: " + header.getMinProcId());<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    out.println();<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>  /**<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * Pass one or more log file names and formatting options and it will dump out<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * a text version of the contents on &lt;code&gt;stdout&lt;/code&gt;.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   *<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   * @param args<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   *          Command line arguments<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * @throws IOException<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   *           Thrown upon file system errors etc.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   */<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  public int run(final String[] args) throws IOException {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    // create options<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    Options options = new Options();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    options.addOption("h", "help", false, "Output help message");<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    options.addOption("f", "file", true, "File to print");<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    final List&lt;Path&gt; files = new ArrayList&lt;&gt;();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    try {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      CommandLine cmd = new PosixParser().parse(options, args);<a name="line.162"></a>
+<span class="sourceLineNo">135</span>  private void printProcedure(Procedure&lt;?&gt; proc) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    out.println(proc.toStringDetails());<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  private void printHeader(ProcedureWALHeader header) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    out.println("ProcedureWALHeader: ");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    out.println("  Version: " + header.getVersion());<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    out.println("  Type: " + header.getType());<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    out.println("  LogId: " + header.getLogId());<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    out.println("  MinProcId: " + header.getMinProcId());<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    out.println();<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>  /**<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * Pass one or more log file names and formatting options and it will dump out<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * a text version of the contents on &lt;code&gt;stdout&lt;/code&gt;.<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   *<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * @param args<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   *          Command line arguments<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * @throws IOException<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   *           Thrown upon file system errors etc.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  public int run(final String[] args) throws IOException {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    // create options<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    Options options = new Options();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    options.addOption("h", "help", false, "Output help message");<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    options.addOption("f", "file", true, "File to print");<a name="line.162"></a>
 <span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>      if (cmd.hasOption("f")) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        files.add(new Path(cmd.getOptionValue("f")));<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      }<a name="line.166"></a>
+<span class="sourceLineNo">164</span>    final List&lt;Path&gt; files = new ArrayList&lt;&gt;();<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    try {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      CommandLine cmd = new PosixParser().parse(options, args);<a name="line.166"></a>
 <span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>      if (files.isEmpty() || cmd.hasOption("h")) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        HelpFormatter formatter = new HelpFormatter();<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        formatter.printHelp("ProcedureWALPrettyPrinter ", options, true);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        return(-1);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    } catch (ParseException e) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      e.printStackTrace();<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      HelpFormatter formatter = new HelpFormatter();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      formatter.printHelp("ProcedureWALPrettyPrinter ", options, true);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      return(-1);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    // get configuration, file system, and process the given files<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    for (Path file : files) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      processFile(getConf(), file);<a name="line.181"></a>
+<span class="sourceLineNo">168</span>      if (cmd.hasOption("f")) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        files.add(new Path(cmd.getOptionValue("f")));<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>      if (files.isEmpty() || cmd.hasOption("h")) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        HelpFormatter formatter = new HelpFormatter();<a name="line.173"></a>
+<span class="sourceLineNo">174</span>        formatter.printHelp("ProcedureWALPrettyPrinter ", options, true);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        return(-1);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      }<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    } catch (ParseException e) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      HelpFormatter formatter = new HelpFormatter();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      formatter.printHelp("ProcedureWALPrettyPrinter ", options, true);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      return(-1);<a name="line.181"></a>
 <span class="sourceLineNo">182</span>    }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    return(0);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public static void main(String[] args) throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    final Configuration conf = HBaseConfiguration.create();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    int exitCode = ToolRunner.run(conf, new ProcedureWALPrettyPrinter(), args);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    System.exit(exitCode);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>}<a name="line.191"></a>
+<span class="sourceLineNo">183</span>    // get configuration, file system, and process the given files<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    for (Path file : files) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      processFile(getConf(), file);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    return(0);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>  }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>  public static void main(String[] args) throws Exception {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    final Configuration conf = HBaseConfiguration.create();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    int exitCode = ToolRunner.run(conf, new ProcedureWALPrettyPrinter(), args);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    System.exit(exitCode);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>}<a name="line.195"></a>
 
 
 


[25/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.append(sourceCf + ":" + destCf);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    }<a name="line.584"></

<TRUNCATED>

[13/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[11/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[41/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html b/devapidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
index 824c796..b61e96f 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
@@ -75,13 +75,13 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.53">TableMapReduceUtil</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.55">TableMapReduceUtil</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Utility for <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred"><code>TableMap</code></a> and <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred"><code>TableReduce</code></a></div>
 </li>
@@ -119,6 +119,25 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -313,6 +332,23 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.56">LOG</a></pre>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.detail">
@@ -325,7 +361,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TableMapReduceUtil</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.53">TableMapReduceUtil</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.55">TableMapReduceUtil</a>()</pre>
 </li>
 </ul>
 </li>
@@ -342,7 +378,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.66">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.69">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -367,7 +403,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.74">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.77">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -382,7 +418,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.95">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.98">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -411,7 +447,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initMultiTableSnapshotMapperJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.138">initMultiTableSnapshotMapperJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&gt;&nbsp;snapshotScans,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.141">initMultiTableSnapshotMapperJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&gt;&nbsp;snapshotScans,
                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputValueClass,
@@ -443,7 +479,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableSnapshotMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.177">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.180">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -481,7 +517,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableSnapshotMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.210">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.213">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -523,7 +559,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableReduceJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.235">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.238">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred">TableReduce</a>&gt;&nbsp;reducer,
                                       org.apache.hadoop.mapred.JobConf&nbsp;job)
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -545,7 +581,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableReduceJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.252">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.255">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred">TableReduce</a>&gt;&nbsp;reducer,
                                       org.apache.hadoop.mapred.JobConf&nbsp;job,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;partitioner)
@@ -570,7 +606,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableReduceJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.271">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.274">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred">TableReduce</a>&gt;&nbsp;reducer,
                                       org.apache.hadoop.mapred.JobConf&nbsp;job,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;partitioner,
@@ -598,7 +634,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initCredentials</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.297">initCredentials</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.300">initCredentials</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -612,7 +648,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>limitNumReduceTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.330">limitNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.333">limitNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                        org.apache.hadoop.mapred.JobConf&nbsp;job)
                                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Ensures that the given number of reduce tasks for the given job
@@ -632,7 +668,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>limitNumMapTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.347">limitNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.350">limitNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                     org.apache.hadoop.mapred.JobConf&nbsp;job)
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Ensures that the given number of map tasks for the given job
@@ -652,7 +688,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setNumReduceTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.363">setNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.366">setNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                      org.apache.hadoop.mapred.JobConf&nbsp;job)
                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets the number of reduce tasks for the given job configuration to the
@@ -672,7 +708,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setNumMapTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.377">setNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.380">setNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                   org.apache.hadoop.mapred.JobConf&nbsp;job)
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets the number of map tasks for the given job configuration to the
@@ -692,7 +728,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setScannerCaching</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.392">setScannerCaching</a>(org.apache.hadoop.mapred.JobConf&nbsp;job,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.395">setScannerCaching</a>(org.apache.hadoop.mapred.JobConf&nbsp;job,
                                      int&nbsp;batchSize)</pre>
 <div class="block">Sets the number of rows to return and cache with each scanner iteration.
  Higher caching values will enable faster mapreduce jobs at the expense of
@@ -711,7 +747,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>addDependencyJars</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.399">addDependencyJars</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.402">addDependencyJars</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -775,13 +811,13 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
index 66dafa5..bb074a9 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.184">CellCounter.IntSumReducer</a>&lt;Key&gt;
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.185">CellCounter.IntSumReducer</a>&lt;Key&gt;
 extends org.apache.hadoop.mapreduce.Reducer&lt;Key,org.apache.hadoop.io.IntWritable,Key,org.apache.hadoop.io.IntWritable&gt;</pre>
 </li>
 </ul>
@@ -230,7 +230,7 @@ extends org.apache.hadoop.mapreduce.Reducer&lt;Key,org.apache.hadoop.io.IntWrita
 <ul class="blockListLast">
 <li class="blockList">
 <h4>result</h4>
-<pre>private&nbsp;org.apache.hadoop.io.IntWritable <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html#line.187">result</a></pre>
+<pre>private&nbsp;org.apache.hadoop.io.IntWritable <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html#line.188">result</a></pre>
 </li>
 </ul>
 </li>
@@ -247,7 +247,7 @@ extends org.apache.hadoop.mapreduce.Reducer&lt;Key,org.apache.hadoop.io.IntWrita
 <ul class="blockListLast">
 <li class="blockList">
 <h4>IntSumReducer</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html#line.184">IntSumReducer</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html#line.185">IntSumReducer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -266,7 +266,7 @@ extends org.apache.hadoop.mapreduce.Reducer&lt;Key,org.apache.hadoop.io.IntWrita
 <ul class="blockListLast">
 <li class="blockList">
 <h4>reduce</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html#line.188">reduce</a>(<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html" title="type parameter in CellCounter.IntSumReducer">Key</a>&nbsp;key,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html#line.189">reduce</a>(<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html" title="type parameter in CellCounter.IntSumReducer">Key</a>&nbsp;key,
                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;org.apache.hadoop.io.IntWritable&gt;&nbsp;values,
                    org.apache.hadoop.mapreduce.Reducer.Context&nbsp;context)
             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
index 396576f..ed1f34c 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
@@ -364,7 +364,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSubmittableJob</h4>
-<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.208">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.209">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets up the actual job.</div>
@@ -385,7 +385,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getConfiguredScanForJob</h4>
-<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.230">getConfiguredScanForJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.231">getConfiguredScanForJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                             <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -400,7 +400,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowFilter</h4>
-<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.256">getRowFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
+<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.257">getRowFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
 </li>
 </ul>
 <a name="getTimeRange-java.lang.String:A-">
@@ -409,7 +409,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTimeRange</h4>
-<pre>private static&nbsp;long[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.269">getTimeRange</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>private static&nbsp;long[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.270">getTimeRange</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -423,7 +423,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.293">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.294">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -439,7 +439,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>printUsage</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.302">printUsage</a>(int&nbsp;parameterCount)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.303">printUsage</a>(int&nbsp;parameterCount)</pre>
 </li>
 </ul>
 <a name="main-java.lang.String:A-">
@@ -448,7 +448,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.332">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.333">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
index 210d0ee..14a696b 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.258">Import.CellImporter</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.259">Import.CellImporter</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.html" title="class in org.apache.hadoop.hbase.mapreduce">TableMapper</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;</pre>
 <div class="block">A mapper that just writes out KeyValues.</div>
 </li>
@@ -248,7 +248,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>cfRenameMap</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.259">cfRenameMap</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.260">cfRenameMap</a></pre>
 </li>
 </ul>
 <a name="filter">
@@ -257,7 +257,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>filter</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.260">filter</a></pre>
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.261">filter</a></pre>
 </li>
 </ul>
 <a name="LOG">
@@ -266,7 +266,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.261">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.262">LOG</a></pre>
 </li>
 </ul>
 </li>
@@ -283,7 +283,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CellImporter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.258">CellImporter</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.259">CellImporter</a>()</pre>
 </li>
 </ul>
 </li>
@@ -300,7 +300,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.270">map</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;row,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.271">map</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;row,
                 <a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -322,7 +322,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.294">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html#line.296">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>setup</code>&nbsp;in class&nbsp;<code>org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;</code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
index d1ed084..546e353 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
@@ -321,7 +321,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html#line.230">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html#line.231">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.Importer.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
index d09f1d1..1b53b43 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.Importer.html
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.303">Import.Importer</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.305">Import.Importer</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.html" title="class in org.apache.hadoop.hbase.mapreduce">TableMapper</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>&gt;</pre>
 <div class="block">Write table content out to files in hdfs.</div>
 </li>
@@ -271,7 +271,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>cfRenameMap</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.304">cfRenameMap</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.306">cfRenameMap</a></pre>
 </li>
 </ul>
 <a name="clusterIds">
@@ -280,7 +280,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>clusterIds</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/UUID.html?is-external=true" title="class or interface in java.util">UUID</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.305">clusterIds</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/UUID.html?is-external=true" title="class or interface in java.util">UUID</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.307">clusterIds</a></pre>
 </li>
 </ul>
 <a name="filter">
@@ -289,7 +289,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>filter</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.306">filter</a></pre>
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.308">filter</a></pre>
 </li>
 </ul>
 <a name="durability">
@@ -298,7 +298,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>durability</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.307">durability</a></pre>
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.309">durability</a></pre>
 </li>
 </ul>
 </li>
@@ -315,7 +315,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Importer</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.303">Importer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.305">Importer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -332,7 +332,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.316">map</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;row,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.318">map</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;row,
                 <a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;value,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -354,7 +354,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>writeResult</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.326">writeResult</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;key,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.329">writeResult</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;key,
                          <a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;result,
                          org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -372,7 +372,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>processKV</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.341">processKV</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;key,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.344">processKV</a>(<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>&nbsp;key,
                          <a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;result,
                          org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context,
                          <a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
@@ -392,7 +392,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>addPutToKv</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.393">addPutToKv</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.396">addPutToKv</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
                           <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;kv)
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -407,7 +407,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapper.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.398">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.Importer.html#line.401">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>setup</code>&nbsp;in class&nbsp;<code>org.apache.hadoop.mapreduce.Mapper&lt;<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>&gt;</code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.html
index fd9f642..1064ba1 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/Import.html
@@ -521,7 +521,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>instantiateFilter</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.442">instantiateFilter</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.445">instantiateFilter</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">Create a <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter"><code>Filter</code></a> to apply to all incoming keys (<a href="../../../../../org/apache/hadoop/hbase/KeyValue.html" title="class in org.apache.hadoop.hbase"><code>KeyValues</code></a>) to
  optionally not include in the job output</div>
 <dl>
@@ -540,7 +540,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>toQuotedByteArrays</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a>&lt;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.473">toQuotedByteArrays</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;stringArgs)</pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a>&lt;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.476">toQuotedByteArrays</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;stringArgs)</pre>
 </li>
 </ul>
 <a name="filterKv-org.apache.hadoop.hbase.filter.Filter-org.apache.hadoop.hbase.Cell-">
@@ -549,7 +549,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>filterKv</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.489">filterKv</a>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;filter,
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.492">filterKv</a>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;filter,
                             <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;c)
                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Attempt to filter out the keyvalue</div>
@@ -570,7 +570,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>convertKv</h4>
-<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.506">convertKv</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;kv,
+<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.509">convertKv</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;kv,
                               <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt;&nbsp;cfRenameMap)</pre>
 </li>
 </ul>
@@ -580,7 +580,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createCfRenameMap</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.531">createCfRenameMap</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.534">createCfRenameMap</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 <a name="configureCfRenaming-org.apache.hadoop.conf.Configuration-java.util.Map-">
@@ -589,7 +589,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>configureCfRenaming</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.564">configureCfRenaming</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.567">configureCfRenaming</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;renameMap)</pre>
 <div class="block"><p>Sets a configuration property with key <a href="../../../../../org/apache/hadoop/hbase/mapreduce/Import.html#CF_RENAME_PROP"><code>CF_RENAME_PROP</code></a> in conf that tells
  the mapper how to rename column families.
@@ -612,7 +612,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>addFilterAndArguments</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.591">addFilterAndArguments</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.594">addFilterAndArguments</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&gt;&nbsp;clazz,
                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;filterArgs)
                                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -633,7 +633,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSubmittableJob</h4>
-<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.604">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.607">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets up the actual job.</div>
@@ -654,7 +654,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.678">usage</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;errorMsg)</pre>
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.681">usage</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;errorMsg)</pre>
 </li>
 </ul>
 <a name="flushRegionsIfNecessary-org.apache.hadoop.conf.Configuration-">
@@ -663,7 +663,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>flushRegionsIfNecessary</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.718">flushRegionsIfNecessary</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.721">flushRegionsIfNecessary</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                                     throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <div class="block">If the durability is set to <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html#SKIP_WAL"><code>Durability.SKIP_WAL</code></a> and the data is imported to hbase, we
@@ -683,7 +683,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.744">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.747">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -699,7 +699,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.777">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.780">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
index 4c73e0e..2bb7798 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.66">SampleUploader.Uploader</a>
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.69">SampleUploader.Uploader</a>
 extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,org.apache.hadoop.io.Text,<a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a>&gt;</pre>
 </li>
 </ul>
@@ -234,7 +234,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockList">
 <li class="blockList">
 <h4>checkpoint</h4>
-<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.69">checkpoint</a></pre>
+<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.72">checkpoint</a></pre>
 </li>
 </ul>
 <a name="count">
@@ -243,7 +243,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>count</h4>
-<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.70">count</a></pre>
+<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.73">count</a></pre>
 </li>
 </ul>
 </li>
@@ -260,7 +260,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Uploader</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.66">Uploader</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.69">Uploader</a>()</pre>
 </li>
 </ul>
 </li>
@@ -277,7 +277,7 @@ extends org.apache.hadoop.mapreduce.Mapper&lt;org.apache.hadoop.io.LongWritable,
 <ul class="blockListLast">
 <li class="blockList">
 <h4>map</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.73">map</a>(org.apache.hadoop.io.LongWritable&nbsp;key,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html#line.76">map</a>(org.apache.hadoop.io.LongWritable&nbsp;key,
                 org.apache.hadoop.io.Text&nbsp;line,
                 org.apache.hadoop.mapreduce.Mapper.Context&nbsp;context)
          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
index 99c2b78..c4382c6 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
@@ -119,7 +119,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.62">SampleUploader</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.64">SampleUploader</a>
 extends org.apache.hadoop.conf.Configured
 implements org.apache.hadoop.util.Tool</pre>
 <div class="block">Sample Uploader MapReduce
@@ -180,6 +180,10 @@ implements org.apache.hadoop.util.Tool</pre>
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/SampleUploader.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/SampleUploader.html#NAME">NAME</a></span></code>&nbsp;</td>
 </tr>
@@ -268,13 +272,22 @@ implements org.apache.hadoop.util.Tool</pre>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.65">LOG</a></pre>
+</li>
+</ul>
 <a name="NAME">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/SampleUploader.html#line.64">NAME</a></pre>
+<pre>private static final&nbsp;<a href="https://docs.oracle.com/javase/8/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/SampleUploader.html#line.67">NAME</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.SampleUploader.NAME">Constant Field Values</a></dd>
@@ -295,7 +308,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SampleUploader</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.62">SampleUploader</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.64">SampleUploader</a>()</pre>
 </li>
 </ul>
 </li>
@@ -312,7 +325,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>configureJob</h4>
-<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.116">configureJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.120">configureJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                     throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Job configuration.</div>
@@ -328,7 +341,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.138">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;otherArgs)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.142">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;otherArgs)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>
@@ -347,7 +360,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.148">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html#line.152">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>


[22/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
index 9501e97..a10ddfe 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
@@ -131,277 +131,279 @@
 <span class="sourceLineNo">123</span>          }<a name="line.123"></a>
 <span class="sourceLineNo">124</span>        }<a name="line.124"></a>
 <span class="sourceLineNo">125</span>      } catch (InterruptedException e) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        e.printStackTrace();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void setup(Context context) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      Configuration conf = context.getConfiguration();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      for (String table : tables) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        tableSet.add(table);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  protected static class WALMapper<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>          TableName targetTable =<a name="line.152"></a>
-<span class="sourceLineNo">153</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.154"></a>
-<span class="sourceLineNo">155</span>          Put put = null;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          Delete del = null;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          Cell lastCell = null;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          for (Cell cell : value.getCells()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>            // filtering WAL meta entries<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>              continue;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>            }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>            // Allow a subclass filter out this cell.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>            if (filter(context, cell)) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.166"></a>
-<span class="sourceLineNo">167</span>              // multiple rows (HBASE-5229).<a name="line.167"></a>
-<span class="sourceLineNo">168</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.168"></a>
-<span class="sourceLineNo">169</span>              // operation before writing to the context.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>                // row or type changed, write out aggregate KVs.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                if (put != null) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                  context.write(tableOut, put);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                if (del != null) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                  context.write(tableOut, del);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                if (CellUtil.isDelete(cell)) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                } else {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.182"></a>
-<span class="sourceLineNo">183</span>                }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>              }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>              if (CellUtil.isDelete(cell)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>                del.add(cell);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>              } else {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>                put.add(cell);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>              }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>            lastCell = cell;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>          }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>          // write residual KVs<a name="line.193"></a>
-<span class="sourceLineNo">194</span>          if (put != null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            context.write(tableOut, put);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>          }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>          if (del != null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>            context.write(tableOut, del);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>          }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      } catch (InterruptedException e) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        e.printStackTrace();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>    protected boolean filter(Context context, final Cell cell) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      return true;<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>    @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    protected void<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            throws IOException, InterruptedException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      super.cleanup(context);<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>    @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    public void setup(Context context) throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      if (tableMap == null) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        tableMap = tablesToUse;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      if (tablesToUse == null) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        // Then user wants all tables.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      int i = 0;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      if (tablesToUse != null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        for (String table : tablesToUse) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
-<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><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    String val = conf.get(option);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    if (null == val) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    long ms;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    try {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      // first try to parse in user friendly form<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    } catch (ParseException pe) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      try {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        // then see if just a number of ms's was specified<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        ms = Long.parseLong(val);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      } catch (NumberFormatException nfe) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        throw new IOException(<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                + "or as number of milliseconds");<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>    conf.setLong(option, ms);<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>  /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * Sets up the actual job.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param args The command line parameters.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @return The newly created job.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @throws IOException When setting up the job fails.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   */<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    Configuration conf = getConf();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    String inputDirs = args[0];<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    String[] tables = args[1].split(",");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    String[] tableMap;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if (args.length &gt; 2) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      tableMap = args[2].split(",");<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      if (tableMap.length != tables.length) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    } else {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      // if not mapping is specified map each table to itself<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      tableMap = tables;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    Job job =<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    job.setJarByClass(WALPlayer.class);<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (hfileOutPath != null) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>      // the bulk HFile case<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      job.setReducerClass(CellSortReducer.class);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      Path outputDir = new Path(hfileOutPath);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        for (TableName tableName : tableNames) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          Table table = conn.getTable(tableName);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      // output to live cluster<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      job.setMapperClass(WALMapper.class);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      TableMapReduceUtil.initCredentials(job);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // No reducers.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      job.setNumReduceTasks(0);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    try {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        Class.forName(codecCls));<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    } catch (Exception e) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    return job;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    for (String name : tables) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      list.add(TableName.valueOf(name));<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    return list;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>  /**<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * Print usage<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * @param errorMsg Error message. Can be null.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  private void usage(final String errorMsg) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      System.err.println("ERROR: " + errorMsg);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Time range options:");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    System.err.println("Other options:");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    System.err.println("For performance also consider the following options:\n"<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        + "  -Dmapreduce.reduce.speculative=false");<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>  /**<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   * Main entry point.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * @param args The command line parameters.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   * @throws Exception When running the job fails.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  public static void main(String[] args) throws Exception {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    System.exit(ret);<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>  @Override<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  public int run(String[] args) throws Exception {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " + args.length);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      System.exit(-1);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Job job = createSubmittableJob(args);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 0 : 1;<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">126</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        Thread.currentThread().interrupt();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    public void setup(Context context) throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Configuration conf = context.getConfiguration();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      for (String table : tables) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        tableSet.add(table);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  protected static class WALMapper<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      try {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>          TableName targetTable =<a name="line.153"></a>
+<span class="sourceLineNo">154</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>          Put put = null;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          Delete del = null;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          Cell lastCell = null;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>          for (Cell cell : value.getCells()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            // filtering WAL meta entries<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>              continue;<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>            // Allow a subclass filter out this cell.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            if (filter(context, cell)) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.167"></a>
+<span class="sourceLineNo">168</span>              // multiple rows (HBASE-5229).<a name="line.168"></a>
+<span class="sourceLineNo">169</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.169"></a>
+<span class="sourceLineNo">170</span>              // operation before writing to the context.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                // row or type changed, write out aggregate KVs.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                if (put != null) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>                  context.write(tableOut, put);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                }<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                if (del != null) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>                  context.write(tableOut, del);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>                if (CellUtil.isDelete(cell)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>                } else {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.183"></a>
+<span class="sourceLineNo">184</span>                }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>              }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>              if (CellUtil.isDelete(cell)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>                del.add(cell);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>              } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>                put.add(cell);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>              }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>            lastCell = cell;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>          }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          // write residual KVs<a name="line.194"></a>
+<span class="sourceLineNo">195</span>          if (put != null) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            context.write(tableOut, put);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>          }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          if (del != null) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            context.write(tableOut, del);<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>      } catch (InterruptedException e) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        LOG.error("Interrupted while writing results", e);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        Thread.currentThread().interrupt();<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 boolean filter(Context context, final Cell cell) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      return true;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    protected void<a name="line.213"></a>
+<span class="sourceLineNo">214</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            throws IOException, InterruptedException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      super.cleanup(context);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    public void setup(Context context) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      if (tableMap == null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        tableMap = tablesToUse;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if (tablesToUse == null) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        // Then user wants all tables.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      int i = 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (tablesToUse != null) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        for (String table : tablesToUse) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<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>    }<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>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    String val = conf.get(option);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (null == val) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      return;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    long ms;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    try {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      // first try to parse in user friendly form<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    } catch (ParseException pe) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      try {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        // then see if just a number of ms's was specified<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        ms = Long.parseLong(val);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      } catch (NumberFormatException nfe) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        throw new IOException(<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.256"></a>
+<span class="sourceLineNo">257</span>                + "or as number of milliseconds");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    conf.setLong(option, ms);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  /**<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   * Sets up the actual job.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param args The command line parameters.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @return The newly created job.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * @throws IOException When setting up the job fails.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    Configuration conf = getConf();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    String inputDirs = args[0];<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    String[] tables = args[1].split(",");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    String[] tableMap;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    if (args.length &gt; 2) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      tableMap = args[2].split(",");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (tableMap.length != tables.length) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    } else {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      // if not mapping is specified map each table to itself<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      tableMap = tables;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    Job job =<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    job.setJarByClass(WALPlayer.class);<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    if (hfileOutPath != null) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>      // the bulk HFile case<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      job.setReducerClass(CellSortReducer.class);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      Path outputDir = new Path(hfileOutPath);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        for (TableName tableName : tableNames) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          Table table = conn.getTable(tableName);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    } else {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      // output to live cluster<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      job.setMapperClass(WALMapper.class);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      TableMapReduceUtil.initCredentials(job);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // No reducers.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      job.setNumReduceTasks(0);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        Class.forName(codecCls));<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } catch (Exception e) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    return job;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    for (String name : tables) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      list.add(TableName.valueOf(name));<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    return list;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>  }<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>   * Print usage<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * @param errorMsg Error message. Can be null.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  private void usage(final String errorMsg) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      System.err.println("ERROR: " + errorMsg);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    System.err.println("Time range options:");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("Other options:");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    System.err.println("For performance also consider the following options:\n"<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        + "  -Dmapreduce.reduce.speculative=false");<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>   * Main entry point.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @param args The command line parameters.<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @throws Exception When running the job fails.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  public static void main(String[] args) throws Exception {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    System.exit(ret);<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>  @Override<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  public int run(String[] args) throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    if (args.length &lt; 2) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      usage("Wrong number of arguments: " + args.length);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      System.exit(-1);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    Job job = createSubmittableJob(args);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    return job.waitForCompletion(true) ? 0 : 1;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>}<a name="line.398"></a>
 
 
 


[32/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellImporter.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.append(sourceCf + ":" + destCf);<a name="line.583"></a>

<TRUNCATED>

[45/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

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

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


[19/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/thrift/DemoClient.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/DemoClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/DemoClient.html
index f580359..cd2224c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/DemoClient.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/DemoClient.html
@@ -56,370 +56,373 @@
 <span class="sourceLineNo">048</span>import org.apache.thrift.transport.TSocket;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import org.apache.thrift.transport.TTransport;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * See the instructions under hbase-examples/README.txt<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@InterfaceAudience.Private<a name="line.55"></a>
-<span class="sourceLineNo">056</span>public class DemoClient {<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>    static protected int port;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    static protected String host;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    CharsetDecoder decoder = null;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>    private static boolean secure = false;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    private static String serverPrincipal = "hbase";<a name="line.63"></a>
+<span class="sourceLineNo">051</span>import org.slf4j.Logger;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.slf4j.LoggerFactory;<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * See the instructions under hbase-examples/README.txt<a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>@InterfaceAudience.Private<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public class DemoClient {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  private static final Logger LOG = LoggerFactory.getLogger(DemoClient.class);<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>    static protected int port;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    static protected String host;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    CharsetDecoder decoder = null;<a name="line.63"></a>
 <span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>    public static void main(String[] args) throws Exception {<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>        if (args.length &lt; 2 || args.length &gt; 4 || (args.length &gt; 2 &amp;&amp; !isBoolean(args[2]))) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>            System.out.println("Invalid arguments!");<a name="line.69"></a>
-<span class="sourceLineNo">070</span>            System.out.println("Usage: DemoClient host port [secure=false [server-principal=hbase] ]");<a name="line.70"></a>
+<span class="sourceLineNo">065</span>    private static boolean secure = false;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    private static String serverPrincipal = "hbase";<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>    public static void main(String[] args) throws Exception {<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>        if (args.length &lt; 2 || args.length &gt; 4 || (args.length &gt; 2 &amp;&amp; !isBoolean(args[2]))) {<a name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>            System.exit(-1);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>        }<a name="line.73"></a>
+<span class="sourceLineNo">072</span>            System.out.println("Invalid arguments!");<a name="line.72"></a>
+<span class="sourceLineNo">073</span>            System.out.println("Usage: DemoClient host port [secure=false [server-principal=hbase] ]");<a name="line.73"></a>
 <span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>        port = Integer.parseInt(args[1]);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>        host = args[0];<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        if (args.length &gt; 2) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>          secure = Boolean.parseBoolean(args[2]);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>        }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>        if (args.length == 4) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>          serverPrincipal = args[3];<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>        final DemoClient client = new DemoClient();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        Subject.doAs(getSubject(),<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          new PrivilegedExceptionAction&lt;Void&gt;() {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>            @Override<a name="line.88"></a>
-<span class="sourceLineNo">089</span>            public Void run() throws Exception {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>              client.run();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>              return null;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          });<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>    private static boolean isBoolean(String s){<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      return Boolean.TRUE.toString().equalsIgnoreCase(s) || Boolean.FALSE.toString().equalsIgnoreCase(s);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>    DemoClient() {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        decoder = Charset.forName("UTF-8").newDecoder();<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>    // Helper to translate byte[]'s to UTF8 strings<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    private String utf8(byte[] buf) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        try {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>            return decoder.decode(ByteBuffer.wrap(buf)).toString();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        } catch (CharacterCodingException e) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            return "[INVALID UTF-8]";<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>    // Helper to translate strings to UTF8 bytes<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    private byte[] bytes(String s) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        try {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            return s.getBytes("UTF-8");<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        } catch (UnsupportedEncodingException e) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            e.printStackTrace();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>            return null;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    private void run() throws Exception {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>        TTransport transport = new TSocket(host, port);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>        if (secure) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>          Map&lt;String, String&gt; saslProperties = new HashMap&lt;&gt;();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>          saslProperties.put(Sasl.QOP, "auth-conf,auth-int,auth");<a name="line.127"></a>
-<span class="sourceLineNo">128</span>          /**<a name="line.128"></a>
-<span class="sourceLineNo">129</span>           * The Thrift server the DemoClient is trying to connect to<a name="line.129"></a>
-<span class="sourceLineNo">130</span>           * must have a matching principal, and support authentication.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>           *<a name="line.131"></a>
-<span class="sourceLineNo">132</span>           * The HBase cluster must be secure, allow proxy user.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>           */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>          transport = new TSaslClientTransport("GSSAPI", null,<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            serverPrincipal, // Thrift server user name, should be an authorized proxy user.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>            host, // Thrift server domain<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            saslProperties, null, transport);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>        }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>        transport.open();<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>        TProtocol protocol = new TBinaryProtocol(transport, true, true);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        Hbase.Client client = new Hbase.Client(protocol);<a name="line.143"></a>
+<span class="sourceLineNo">075</span>            System.exit(-1);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>        }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>        port = Integer.parseInt(args[1]);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        host = args[0];<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        if (args.length &gt; 2) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>          secure = Boolean.parseBoolean(args[2]);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>        }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>        if (args.length == 4) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          serverPrincipal = args[3];<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>        final DemoClient client = new DemoClient();<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        Subject.doAs(getSubject(),<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          new PrivilegedExceptionAction&lt;Void&gt;() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            @Override<a name="line.91"></a>
+<span class="sourceLineNo">092</span>            public Void run() throws Exception {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>              client.run();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>              return null;<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><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    private static boolean isBoolean(String s){<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      return Boolean.TRUE.toString().equalsIgnoreCase(s) || Boolean.FALSE.toString().equalsIgnoreCase(s);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>    DemoClient() {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        decoder = Charset.forName("UTF-8").newDecoder();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>    // Helper to translate byte[]'s to UTF8 strings<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    private String utf8(byte[] buf) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        try {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            return decoder.decode(ByteBuffer.wrap(buf)).toString();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>        } catch (CharacterCodingException e) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            return "[INVALID UTF-8]";<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  // Helper to translate strings to UTF8 bytes<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  private byte[] bytes(String s) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    try {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      return s.getBytes("UTF-8");<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    } catch (UnsupportedEncodingException e) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      LOG.error("CharSetName {} not supported", s, e);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      return null;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    private void run() throws Exception {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        TTransport transport = new TSocket(host, port);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        if (secure) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>          Map&lt;String, String&gt; saslProperties = new HashMap&lt;&gt;();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>          saslProperties.put(Sasl.QOP, "auth-conf,auth-int,auth");<a name="line.130"></a>
+<span class="sourceLineNo">131</span>          /**<a name="line.131"></a>
+<span class="sourceLineNo">132</span>           * The Thrift server the DemoClient is trying to connect to<a name="line.132"></a>
+<span class="sourceLineNo">133</span>           * must have a matching principal, and support authentication.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>           *<a name="line.134"></a>
+<span class="sourceLineNo">135</span>           * The HBase cluster must be secure, allow proxy user.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>           */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>          transport = new TSaslClientTransport("GSSAPI", null,<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            serverPrincipal, // Thrift server user name, should be an authorized proxy user.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            host, // Thrift server domain<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            saslProperties, null, transport);<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>        transport.open();<a name="line.143"></a>
 <span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>        byte[] t = bytes("demo_table");<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>        // Scan all tables, look for the demo table and delete it.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>        //<a name="line.149"></a>
-<span class="sourceLineNo">150</span>        System.out.println("scanning tables...");<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        for (ByteBuffer name : client.getTableNames()) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>            System.out.println("  found: " + utf8(name.array()));<a name="line.152"></a>
-<span class="sourceLineNo">153</span>            if (utf8(name.array()).equals(utf8(t))) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>                if (client.isTableEnabled(name)) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>                    System.out.println("    disabling table: " + utf8(name.array()));<a name="line.155"></a>
-<span class="sourceLineNo">156</span>                    client.disableTable(name);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>                }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>                System.out.println("    deleting table: " + utf8(name.array()));<a name="line.158"></a>
-<span class="sourceLineNo">159</span>                client.deleteTable(name);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>        //<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        // Create the demo table with two column families, entry: and unused:<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        //<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        ArrayList&lt;ColumnDescriptor&gt; columns = new ArrayList&lt;&gt;(2);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        ColumnDescriptor col;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        col = new ColumnDescriptor();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        col.name = ByteBuffer.wrap(bytes("entry:"));<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        col.timeToLive = Integer.MAX_VALUE;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        col.maxVersions = 10;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        columns.add(col);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        col = new ColumnDescriptor();<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        col.name = ByteBuffer.wrap(bytes("unused:"));<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        col.timeToLive = Integer.MAX_VALUE;<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        columns.add(col);<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>        System.out.println("creating table: " + utf8(t));<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        try {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>            client.createTable(ByteBuffer.wrap(t), columns);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        } catch (AlreadyExists ae) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>            System.out.println("WARN: " + ae.message);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>        System.out.println("column families in " + utf8(t) + ": ");<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        Map&lt;ByteBuffer, ColumnDescriptor&gt; columnMap = client.getColumnDescriptors(ByteBuffer.wrap(t));<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        for (ColumnDescriptor col2 : columnMap.values()) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>            System.out.println("  column: " + utf8(col2.name.array()) + ", maxVer: " + Integer.toString(col2.maxVersions));<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>        Map&lt;ByteBuffer, ByteBuffer&gt; dummyAttributes = null;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        boolean writeToWal = false;<a name="line.192"></a>
+<span class="sourceLineNo">145</span>        TProtocol protocol = new TBinaryProtocol(transport, true, true);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        Hbase.Client client = new Hbase.Client(protocol);<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>        byte[] t = bytes("demo_table");<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>        //<a name="line.150"></a>
+<span class="sourceLineNo">151</span>        // Scan all tables, look for the demo table and delete it.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        //<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        System.out.println("scanning tables...");<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        for (ByteBuffer name : client.getTableNames()) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            System.out.println("  found: " + utf8(name.array()));<a name="line.155"></a>
+<span class="sourceLineNo">156</span>            if (utf8(name.array()).equals(utf8(t))) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>                if (client.isTableEnabled(name)) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>                    System.out.println("    disabling table: " + utf8(name.array()));<a name="line.158"></a>
+<span class="sourceLineNo">159</span>                    client.disableTable(name);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>                }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>                System.out.println("    deleting table: " + utf8(name.array()));<a name="line.161"></a>
+<span class="sourceLineNo">162</span>                client.deleteTable(name);<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><a name="line.165"></a>
+<span class="sourceLineNo">166</span>        //<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        // Create the demo table with two column families, entry: and unused:<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        //<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        ArrayList&lt;ColumnDescriptor&gt; columns = new ArrayList&lt;&gt;(2);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        ColumnDescriptor col;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        col = new ColumnDescriptor();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        col.name = ByteBuffer.wrap(bytes("entry:"));<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        col.timeToLive = Integer.MAX_VALUE;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>        col.maxVersions = 10;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        columns.add(col);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        col = new ColumnDescriptor();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        col.name = ByteBuffer.wrap(bytes("unused:"));<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        col.timeToLive = Integer.MAX_VALUE;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        columns.add(col);<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>        System.out.println("creating table: " + utf8(t));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        try {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>            client.createTable(ByteBuffer.wrap(t), columns);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        } catch (AlreadyExists ae) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>            System.out.println("WARN: " + ae.message);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>        System.out.println("column families in " + utf8(t) + ": ");<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        Map&lt;ByteBuffer, ColumnDescriptor&gt; columnMap = client.getColumnDescriptors(ByteBuffer.wrap(t));<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        for (ColumnDescriptor col2 : columnMap.values()) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            System.out.println("  column: " + utf8(col2.name.array()) + ", maxVer: " + Integer.toString(col2.maxVersions));<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        }<a name="line.192"></a>
 <span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>        //<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        // Test UTF-8 handling<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        //<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        byte[] invalid = {(byte) 'f', (byte) 'o', (byte) 'o', (byte) '-',<a name="line.197"></a>
-<span class="sourceLineNo">198</span>            (byte) 0xfc, (byte) 0xa1, (byte) 0xa1, (byte) 0xa1, (byte) 0xa1};<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        byte[] valid = {(byte) 'f', (byte) 'o', (byte) 'o', (byte) '-',<a name="line.199"></a>
-<span class="sourceLineNo">200</span>            (byte) 0xE7, (byte) 0x94, (byte) 0x9F, (byte) 0xE3, (byte) 0x83,<a name="line.200"></a>
-<span class="sourceLineNo">201</span>            (byte) 0x93, (byte) 0xE3, (byte) 0x83, (byte) 0xBC, (byte) 0xE3,<a name="line.201"></a>
-<span class="sourceLineNo">202</span>            (byte) 0x83, (byte) 0xAB};<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>        ArrayList&lt;Mutation&gt; mutations;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        // non-utf8 is fine for data<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        mutations = new ArrayList&lt;&gt;(1);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")),<a name="line.207"></a>
-<span class="sourceLineNo">208</span>            ByteBuffer.wrap(invalid), writeToWal));<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(bytes("foo")),<a name="line.209"></a>
-<span class="sourceLineNo">210</span>            mutations, dummyAttributes);<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>        // this row name is valid utf8<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        mutations = new ArrayList&lt;&gt;(1);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")), ByteBuffer.wrap(valid), writeToWal));<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(valid), mutations, dummyAttributes);<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>        // non-utf8 is now allowed in row names because HBase stores values as binary<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>        mutations = new ArrayList&lt;&gt;(1);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")), ByteBuffer.wrap(invalid), writeToWal));<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(invalid), mutations, dummyAttributes);<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>        // Run a scanner on the rows we just created<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        ArrayList&lt;ByteBuffer&gt; columnNames = new ArrayList&lt;&gt;();<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        columnNames.add(ByteBuffer.wrap(bytes("entry:")));<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>        System.out.println("Starting scanner...");<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        int scanner = client.scannerOpen(ByteBuffer.wrap(t), ByteBuffer.wrap(bytes("")), columnNames, dummyAttributes);<a name="line.230"></a>
+<span class="sourceLineNo">194</span>        Map&lt;ByteBuffer, ByteBuffer&gt; dummyAttributes = null;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        boolean writeToWal = false;<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>        //<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        // Test UTF-8 handling<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        //<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        byte[] invalid = {(byte) 'f', (byte) 'o', (byte) 'o', (byte) '-',<a name="line.200"></a>
+<span class="sourceLineNo">201</span>            (byte) 0xfc, (byte) 0xa1, (byte) 0xa1, (byte) 0xa1, (byte) 0xa1};<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        byte[] valid = {(byte) 'f', (byte) 'o', (byte) 'o', (byte) '-',<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            (byte) 0xE7, (byte) 0x94, (byte) 0x9F, (byte) 0xE3, (byte) 0x83,<a name="line.203"></a>
+<span class="sourceLineNo">204</span>            (byte) 0x93, (byte) 0xE3, (byte) 0x83, (byte) 0xBC, (byte) 0xE3,<a name="line.204"></a>
+<span class="sourceLineNo">205</span>            (byte) 0x83, (byte) 0xAB};<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span>        ArrayList&lt;Mutation&gt; mutations;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        // non-utf8 is fine for data<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        mutations = new ArrayList&lt;&gt;(1);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")),<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            ByteBuffer.wrap(invalid), writeToWal));<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(bytes("foo")),<a name="line.212"></a>
+<span class="sourceLineNo">213</span>            mutations, dummyAttributes);<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>        // this row name is valid utf8<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        mutations = new ArrayList&lt;&gt;(1);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>        mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")), ByteBuffer.wrap(valid), writeToWal));<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(valid), mutations, dummyAttributes);<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>        // non-utf8 is now allowed in row names because HBase stores values as binary<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>        mutations = new ArrayList&lt;&gt;(1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")), ByteBuffer.wrap(invalid), writeToWal));<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(invalid), mutations, dummyAttributes);<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>        // Run a scanner on the rows we just created<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        ArrayList&lt;ByteBuffer&gt; columnNames = new ArrayList&lt;&gt;();<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        columnNames.add(ByteBuffer.wrap(bytes("entry:")));<a name="line.230"></a>
 <span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>        while (true) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>            List&lt;TRowResult&gt; entry = client.scannerGet(scanner);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>            if (entry.isEmpty()) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>                break;<a name="line.235"></a>
-<span class="sourceLineNo">236</span>            }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>            printRow(entry);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        }<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>        // Run some operations on a bunch of rows<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        //<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        for (int i = 100; i &gt;= 0; --i) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            // format row keys as "00000" to "00100"<a name="line.244"></a>
-<span class="sourceLineNo">245</span>            NumberFormat nf = NumberFormat.getInstance();<a name="line.245"></a>
-<span class="sourceLineNo">246</span>            nf.setMinimumIntegerDigits(5);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>            nf.setGroupingUsed(false);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>            byte[] row = bytes(nf.format(i));<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>            mutations = new ArrayList&lt;&gt;(1);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("unused:")), ByteBuffer.wrap(bytes("DELETE_ME")), writeToWal));<a name="line.251"></a>
-<span class="sourceLineNo">252</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            client.deleteAllRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes);<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>            // sleep to force later timestamp<a name="line.256"></a>
-<span class="sourceLineNo">257</span>            try {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>                Thread.sleep(50);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            } catch (InterruptedException e) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>                // no-op<a name="line.260"></a>
-<span class="sourceLineNo">261</span>            }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>            mutations = new ArrayList&lt;&gt;(2);<a name="line.263"></a>
-<span class="sourceLineNo">264</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:num")), ByteBuffer.wrap(bytes("0")), writeToWal));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")), ByteBuffer.wrap(bytes("FOO")), writeToWal));<a name="line.265"></a>
-<span class="sourceLineNo">266</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>            Mutation m;<a name="line.269"></a>
-<span class="sourceLineNo">270</span>            mutations = new ArrayList&lt;&gt;(2);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>            m = new Mutation();<a name="line.271"></a>
-<span class="sourceLineNo">272</span>            m.column = ByteBuffer.wrap(bytes("entry:foo"));<a name="line.272"></a>
-<span class="sourceLineNo">273</span>            m.isDelete = true;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>            mutations.add(m);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>            m = new Mutation();<a name="line.275"></a>
-<span class="sourceLineNo">276</span>            m.column = ByteBuffer.wrap(bytes("entry:num"));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>            m.value = ByteBuffer.wrap(bytes("-1"));<a name="line.277"></a>
-<span class="sourceLineNo">278</span>            mutations.add(m);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>            mutations = new ArrayList&lt;&gt;();<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:num")), ByteBuffer.wrap(bytes(Integer.toString(i))), writeToWal));<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:sqr")), ByteBuffer.wrap(bytes(Integer.toString(i * i))), writeToWal));<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>            // sleep to force later timestamp<a name="line.288"></a>
-<span class="sourceLineNo">289</span>            try {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>                Thread.sleep(50);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            } catch (InterruptedException e) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>                // no-op<a name="line.292"></a>
-<span class="sourceLineNo">293</span>            }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>            mutations.clear();<a name="line.295"></a>
-<span class="sourceLineNo">296</span>            m = new Mutation();<a name="line.296"></a>
-<span class="sourceLineNo">297</span>            m.column = ByteBuffer.wrap(bytes("entry:num"));<a name="line.297"></a>
-<span class="sourceLineNo">298</span>            m.value= ByteBuffer.wrap(bytes("-999"));<a name="line.298"></a>
-<span class="sourceLineNo">299</span>            mutations.add(m);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>            m = new Mutation();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>            m.column = ByteBuffer.wrap(bytes("entry:sqr"));<a name="line.301"></a>
-<span class="sourceLineNo">302</span>            m.isDelete = true;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>            client.mutateRowTs(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, 1, dummyAttributes); // shouldn't override latest<a name="line.303"></a>
-<span class="sourceLineNo">304</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>            List&lt;TCell&gt; versions = client.getVer(ByteBuffer.wrap(t), ByteBuffer.wrap(row), ByteBuffer.wrap(bytes("entry:num")), 10, dummyAttributes);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>            printVersions(ByteBuffer.wrap(row), versions);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>            if (versions.isEmpty()) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>                System.out.println("FATAL: wrong # of versions");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>                System.exit(-1);<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>            List&lt;TCell&gt; result = client.get(ByteBuffer.wrap(t), ByteBuffer.wrap(row), ByteBuffer.wrap(bytes("entry:foo")), dummyAttributes);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>            if (!result.isEmpty()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>                System.out.println("FATAL: shouldn't get here");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>                System.exit(-1);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>            }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>            System.out.println("");<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        }<a name="line.320"></a>
+<span class="sourceLineNo">232</span>        System.out.println("Starting scanner...");<a name="line.232"></a>
+<span class="sourceLineNo">233</span>        int scanner = client.scannerOpen(ByteBuffer.wrap(t), ByteBuffer.wrap(bytes("")), columnNames, dummyAttributes);<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>        while (true) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>            List&lt;TRowResult&gt; entry = client.scannerGet(scanner);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>            if (entry.isEmpty()) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>                break;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>            }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>            printRow(entry);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>        //<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        // Run some operations on a bunch of rows<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        //<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        for (int i = 100; i &gt;= 0; --i) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>            // format row keys as "00000" to "00100"<a name="line.247"></a>
+<span class="sourceLineNo">248</span>            NumberFormat nf = NumberFormat.getInstance();<a name="line.248"></a>
+<span class="sourceLineNo">249</span>            nf.setMinimumIntegerDigits(5);<a name="line.249"></a>
+<span class="sourceLineNo">250</span>            nf.setGroupingUsed(false);<a name="line.250"></a>
+<span class="sourceLineNo">251</span>            byte[] row = bytes(nf.format(i));<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>            mutations = new ArrayList&lt;&gt;(1);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("unused:")), ByteBuffer.wrap(bytes("DELETE_ME")), writeToWal));<a name="line.254"></a>
+<span class="sourceLineNo">255</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.256"></a>
+<span class="sourceLineNo">257</span>            client.deleteAllRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes);<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span>            // sleep to force later timestamp<a name="line.259"></a>
+<span class="sourceLineNo">260</span>            try {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>                Thread.sleep(50);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>            } catch (InterruptedException e) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>                // no-op<a name="line.263"></a>
+<span class="sourceLineNo">264</span>            }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>            mutations = new ArrayList&lt;&gt;(2);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:num")), ByteBuffer.wrap(bytes("0")), writeToWal));<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:foo")), ByteBuffer.wrap(bytes("FOO")), writeToWal));<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.269"></a>
+<span class="sourceLineNo">270</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>            Mutation m;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>            mutations = new ArrayList&lt;&gt;(2);<a name="line.273"></a>
+<span class="sourceLineNo">274</span>            m = new Mutation();<a name="line.274"></a>
+<span class="sourceLineNo">275</span>            m.column = ByteBuffer.wrap(bytes("entry:foo"));<a name="line.275"></a>
+<span class="sourceLineNo">276</span>            m.isDelete = true;<a name="line.276"></a>
+<span class="sourceLineNo">277</span>            mutations.add(m);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>            m = new Mutation();<a name="line.278"></a>
+<span class="sourceLineNo">279</span>            m.column = ByteBuffer.wrap(bytes("entry:num"));<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            m.value = ByteBuffer.wrap(bytes("-1"));<a name="line.280"></a>
+<span class="sourceLineNo">281</span>            mutations.add(m);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>            mutations = new ArrayList&lt;&gt;();<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:num")), ByteBuffer.wrap(bytes(Integer.toString(i))), writeToWal));<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            mutations.add(new Mutation(false, ByteBuffer.wrap(bytes("entry:sqr")), ByteBuffer.wrap(bytes(Integer.toString(i * i))), writeToWal));<a name="line.287"></a>
+<span class="sourceLineNo">288</span>            client.mutateRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, dummyAttributes);<a name="line.288"></a>
+<span class="sourceLineNo">289</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>            // sleep to force later timestamp<a name="line.291"></a>
+<span class="sourceLineNo">292</span>            try {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>                Thread.sleep(50);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>            } catch (InterruptedException e) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>                // no-op<a name="line.295"></a>
+<span class="sourceLineNo">296</span>            }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>            mutations.clear();<a name="line.298"></a>
+<span class="sourceLineNo">299</span>            m = new Mutation();<a name="line.299"></a>
+<span class="sourceLineNo">300</span>            m.column = ByteBuffer.wrap(bytes("entry:num"));<a name="line.300"></a>
+<span class="sourceLineNo">301</span>            m.value= ByteBuffer.wrap(bytes("-999"));<a name="line.301"></a>
+<span class="sourceLineNo">302</span>            mutations.add(m);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>            m = new Mutation();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>            m.column = ByteBuffer.wrap(bytes("entry:sqr"));<a name="line.304"></a>
+<span class="sourceLineNo">305</span>            m.isDelete = true;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>            client.mutateRowTs(ByteBuffer.wrap(t), ByteBuffer.wrap(row), mutations, 1, dummyAttributes); // shouldn't override latest<a name="line.306"></a>
+<span class="sourceLineNo">307</span>            printRow(client.getRow(ByteBuffer.wrap(t), ByteBuffer.wrap(row), dummyAttributes));<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>            List&lt;TCell&gt; versions = client.getVer(ByteBuffer.wrap(t), ByteBuffer.wrap(row), ByteBuffer.wrap(bytes("entry:num")), 10, dummyAttributes);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>            printVersions(ByteBuffer.wrap(row), versions);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>            if (versions.isEmpty()) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>                System.out.println("FATAL: wrong # of versions");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>                System.exit(-1);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>            }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>            List&lt;TCell&gt; result = client.get(ByteBuffer.wrap(t), ByteBuffer.wrap(row), ByteBuffer.wrap(bytes("entry:foo")), dummyAttributes);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>            if (!result.isEmpty()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>                System.out.println("FATAL: shouldn't get here");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>                System.exit(-1);<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>        // scan all rows/columnNames<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>        columnNames.clear();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        for (ColumnDescriptor col2 : client.getColumnDescriptors(ByteBuffer.wrap(t)).values()) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>            System.out.println("column with name: " + new String(col2.name.array()));<a name="line.326"></a>
-<span class="sourceLineNo">327</span>            System.out.println(col2.toString());<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>            columnNames.add(col2.name);<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        }<a name="line.330"></a>
+<span class="sourceLineNo">322</span>            System.out.println("");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>        }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>        // scan all rows/columnNames<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>        columnNames.clear();<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        for (ColumnDescriptor col2 : client.getColumnDescriptors(ByteBuffer.wrap(t)).values()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>            System.out.println("column with name: " + new String(col2.name.array()));<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            System.out.println(col2.toString());<a name="line.330"></a>
 <span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>        System.out.println("Starting scanner...");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>        scanner = client.scannerOpenWithStop(ByteBuffer.wrap(t), ByteBuffer.wrap(bytes("00020")), ByteBuffer.wrap(bytes("00040")), columnNames, dummyAttributes);<a name="line.333"></a>
+<span class="sourceLineNo">332</span>            columnNames.add(col2.name);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        }<a name="line.333"></a>
 <span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>        while (true) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>            List&lt;TRowResult&gt; entry = client.scannerGet(scanner);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>            if (entry.isEmpty()) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>                System.out.println("Scanner finished");<a name="line.338"></a>
-<span class="sourceLineNo">339</span>                break;<a name="line.339"></a>
-<span class="sourceLineNo">340</span>            }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>            printRow(entry);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>        transport.close();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    }<a name="line.345"></a>
+<span class="sourceLineNo">335</span>        System.out.println("Starting scanner...");<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        scanner = client.scannerOpenWithStop(ByteBuffer.wrap(t), ByteBuffer.wrap(bytes("00020")), ByteBuffer.wrap(bytes("00040")), columnNames, dummyAttributes);<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>        while (true) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span>            List&lt;TRowResult&gt; entry = client.scannerGet(scanner);<a name="line.339"></a>
+<span class="sourceLineNo">340</span>            if (entry.isEmpty()) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>                System.out.println("Scanner finished");<a name="line.341"></a>
+<span class="sourceLineNo">342</span>                break;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>            }<a name="line.343"></a>
+<span class="sourceLineNo">344</span>            printRow(entry);<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>    private void printVersions(ByteBuffer row, List&lt;TCell&gt; versions) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        StringBuilder rowStr = new StringBuilder();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        for (TCell cell : versions) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>            rowStr.append(utf8(cell.value.array()));<a name="line.350"></a>
-<span class="sourceLineNo">351</span>            rowStr.append("; ");<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        }<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        System.out.println("row: " + utf8(row.array()) + ", values: " + rowStr);<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span>    private void printRow(TRowResult rowResult) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        // copy values into a TreeMap to get them in sorted order<a name="line.357"></a>
+<span class="sourceLineNo">347</span>        transport.close();<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>    private void printVersions(ByteBuffer row, List&lt;TCell&gt; versions) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        StringBuilder rowStr = new StringBuilder();<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        for (TCell cell : versions) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span>            rowStr.append(utf8(cell.value.array()));<a name="line.353"></a>
+<span class="sourceLineNo">354</span>            rowStr.append("; ");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>        }<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        System.out.println("row: " + utf8(row.array()) + ", values: " + rowStr);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
 <span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>        TreeMap&lt;String, TCell&gt; sorted = new TreeMap&lt;&gt;();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        for (Map.Entry&lt;ByteBuffer, TCell&gt; column : rowResult.columns.entrySet()) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            sorted.put(utf8(column.getKey().array()), column.getValue());<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>        StringBuilder rowStr = new StringBuilder();<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        for (SortedMap.Entry&lt;String, TCell&gt; entry : sorted.entrySet()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>            rowStr.append(entry.getKey());<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            rowStr.append(" =&gt; ");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>            rowStr.append(utf8(entry.getValue().value.array()));<a name="line.368"></a>
-<span class="sourceLineNo">369</span>            rowStr.append("; ");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        }<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        System.out.println("row: " + utf8(rowResult.row.array()) + ", cols: " + rowStr);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>    private void printRow(List&lt;TRowResult&gt; rows) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        for (TRowResult rowResult : rows) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>            printRow(rowResult);<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>    static Subject getSubject() throws Exception {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      if (!secure) return new Subject();<a name="line.381"></a>
+<span class="sourceLineNo">359</span>    private void printRow(TRowResult rowResult) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        // copy values into a TreeMap to get them in sorted order<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>        TreeMap&lt;String, TCell&gt; sorted = new TreeMap&lt;&gt;();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        for (Map.Entry&lt;ByteBuffer, TCell&gt; column : rowResult.columns.entrySet()) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            sorted.put(utf8(column.getKey().array()), column.getValue());<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>        StringBuilder rowStr = new StringBuilder();<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        for (SortedMap.Entry&lt;String, TCell&gt; entry : sorted.entrySet()) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>            rowStr.append(entry.getKey());<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            rowStr.append(" =&gt; ");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>            rowStr.append(utf8(entry.getValue().value.array()));<a name="line.371"></a>
+<span class="sourceLineNo">372</span>            rowStr.append("; ");<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        System.out.println("row: " + utf8(rowResult.row.array()) + ", cols: " + rowStr);<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>    private void printRow(List&lt;TRowResult&gt; rows) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        for (TRowResult rowResult : rows) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            printRow(rowResult);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    }<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>       * To authenticate the DemoClient, kinit should be invoked ahead.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>       * Here we try to get the Kerberos credential from the ticket cache.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>       */<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      LoginContext context = new LoginContext("", new Subject(), null,<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        new Configuration() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>          @Override<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          public AppConfigurationEntry[] getAppConfigurationEntry(String name) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            Map&lt;String, String&gt; options = new HashMap&lt;&gt;();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            options.put("useKeyTab", "false");<a name="line.392"></a>
-<span class="sourceLineNo">393</span>            options.put("storeKey", "false");<a name="line.393"></a>
-<span class="sourceLineNo">394</span>            options.put("doNotPrompt", "true");<a name="line.394"></a>
-<span class="sourceLineNo">395</span>            options.put("useTicketCache", "true");<a name="line.395"></a>
-<span class="sourceLineNo">396</span>            options.put("renewTGT", "true");<a name="line.396"></a>
-<span class="sourceLineNo">397</span>            options.put("refreshKrb5Config", "true");<a name="line.397"></a>
-<span class="sourceLineNo">398</span>            options.put("isInitiator", "true");<a name="line.398"></a>
-<span class="sourceLineNo">399</span>            String ticketCache = System.getenv("KRB5CCNAME");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            if (ticketCache != null) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>              options.put("ticketCache", ticketCache);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>            }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            options.put("debug", "true");<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>            return new AppConfigurationEntry[]{<a name="line.405"></a>
-<span class="sourceLineNo">406</span>                new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule",<a name="line.406"></a>
-<span class="sourceLineNo">407</span>                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,<a name="line.407"></a>
-<span class="sourceLineNo">408</span>                    options)};<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        });<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      context.login();<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      return context.getSubject();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    }<a name="line.413"></a>
-<span class="sourceLineNo">414</span>}<a name="line.414"></a>
+<span class="sourceLineNo">383</span>    static Subject getSubject() throws Exception {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      if (!secure) return new Subject();<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>       * To authenticate the DemoClient, kinit should be invoked ahead.<a name="line.387"></a>
+<span class="sourceLineNo">388</span>       * Here we try to get the Kerberos credential from the ticket cache.<a name="line.388"></a>
+<span class="sourceLineNo">389</span>       */<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      LoginContext context = new LoginContext("", new Subject(), null,<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        new Configuration() {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          @Override<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          public AppConfigurationEntry[] getAppConfigurationEntry(String name) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            Map&lt;String, String&gt; options = new HashMap&lt;&gt;();<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            options.put("useKeyTab", "false");<a name="line.395"></a>
+<span class="sourceLineNo">396</span>            options.put("storeKey", "false");<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            options.put("doNotPrompt", "true");<a name="line.397"></a>
+<span class="sourceLineNo">398</span>            options.put("useTicketCache", "true");<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            options.put("renewTGT", "true");<a name="line.399"></a>
+<span class="sourceLineNo">400</span>            options.put("refreshKrb5Config", "true");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            options.put("isInitiator", "true");<a name="line.401"></a>
+<span class="sourceLineNo">402</span>            String ticketCache = System.getenv("KRB5CCNAME");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            if (ticketCache != null) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>              options.put("ticketCache", ticketCache);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>            options.put("debug", "true");<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>            return new AppConfigurationEntry[]{<a name="line.408"></a>
+<span class="sourceLineNo">409</span>                new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule",<a name="line.409"></a>
+<span class="sourceLineNo">410</span>                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,<a name="line.410"></a>
+<span class="sourceLineNo">411</span>                    options)};<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>      context.login();<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      return context.getSubject();<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    }<a name="line.416"></a>
+<span class="sourceLineNo">417</span>}<a name="line.417"></a>
 
 
 


[08/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[21/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
index 9501e97..a10ddfe 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
@@ -131,277 +131,279 @@
 <span class="sourceLineNo">123</span>          }<a name="line.123"></a>
 <span class="sourceLineNo">124</span>        }<a name="line.124"></a>
 <span class="sourceLineNo">125</span>      } catch (InterruptedException e) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        e.printStackTrace();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void setup(Context context) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      Configuration conf = context.getConfiguration();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      for (String table : tables) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        tableSet.add(table);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  protected static class WALMapper<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>          TableName targetTable =<a name="line.152"></a>
-<span class="sourceLineNo">153</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.154"></a>
-<span class="sourceLineNo">155</span>          Put put = null;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          Delete del = null;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          Cell lastCell = null;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          for (Cell cell : value.getCells()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>            // filtering WAL meta entries<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>              continue;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>            }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>            // Allow a subclass filter out this cell.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>            if (filter(context, cell)) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.166"></a>
-<span class="sourceLineNo">167</span>              // multiple rows (HBASE-5229).<a name="line.167"></a>
-<span class="sourceLineNo">168</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.168"></a>
-<span class="sourceLineNo">169</span>              // operation before writing to the context.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>                // row or type changed, write out aggregate KVs.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                if (put != null) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                  context.write(tableOut, put);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                if (del != null) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                  context.write(tableOut, del);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                if (CellUtil.isDelete(cell)) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                } else {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.182"></a>
-<span class="sourceLineNo">183</span>                }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>              }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>              if (CellUtil.isDelete(cell)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>                del.add(cell);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>              } else {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>                put.add(cell);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>              }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>            lastCell = cell;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>          }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>          // write residual KVs<a name="line.193"></a>
-<span class="sourceLineNo">194</span>          if (put != null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            context.write(tableOut, put);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>          }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>          if (del != null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>            context.write(tableOut, del);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>          }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      } catch (InterruptedException e) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        e.printStackTrace();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>    protected boolean filter(Context context, final Cell cell) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      return true;<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>    @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    protected void<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            throws IOException, InterruptedException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      super.cleanup(context);<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>    @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    public void setup(Context context) throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      if (tableMap == null) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        tableMap = tablesToUse;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      if (tablesToUse == null) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        // Then user wants all tables.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      int i = 0;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      if (tablesToUse != null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        for (String table : tablesToUse) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
-<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><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    String val = conf.get(option);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    if (null == val) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    long ms;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    try {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      // first try to parse in user friendly form<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    } catch (ParseException pe) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      try {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        // then see if just a number of ms's was specified<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        ms = Long.parseLong(val);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      } catch (NumberFormatException nfe) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        throw new IOException(<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                + "or as number of milliseconds");<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>    conf.setLong(option, ms);<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>  /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * Sets up the actual job.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param args The command line parameters.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @return The newly created job.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @throws IOException When setting up the job fails.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   */<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    Configuration conf = getConf();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    String inputDirs = args[0];<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    String[] tables = args[1].split(",");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    String[] tableMap;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if (args.length &gt; 2) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      tableMap = args[2].split(",");<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      if (tableMap.length != tables.length) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    } else {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      // if not mapping is specified map each table to itself<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      tableMap = tables;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    Job job =<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    job.setJarByClass(WALPlayer.class);<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (hfileOutPath != null) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>      // the bulk HFile case<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      job.setReducerClass(CellSortReducer.class);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      Path outputDir = new Path(hfileOutPath);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        for (TableName tableName : tableNames) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          Table table = conn.getTable(tableName);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      // output to live cluster<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      job.setMapperClass(WALMapper.class);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      TableMapReduceUtil.initCredentials(job);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // No reducers.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      job.setNumReduceTasks(0);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    try {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        Class.forName(codecCls));<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    } catch (Exception e) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    return job;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    for (String name : tables) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      list.add(TableName.valueOf(name));<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    return list;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>  /**<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * Print usage<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * @param errorMsg Error message. Can be null.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  private void usage(final String errorMsg) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      System.err.println("ERROR: " + errorMsg);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Time range options:");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    System.err.println("Other options:");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    System.err.println("For performance also consider the following options:\n"<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        + "  -Dmapreduce.reduce.speculative=false");<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>  /**<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   * Main entry point.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * @param args The command line parameters.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   * @throws Exception When running the job fails.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  public static void main(String[] args) throws Exception {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    System.exit(ret);<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>  @Override<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  public int run(String[] args) throws Exception {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " + args.length);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      System.exit(-1);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Job job = createSubmittableJob(args);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 0 : 1;<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">126</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        Thread.currentThread().interrupt();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    public void setup(Context context) throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Configuration conf = context.getConfiguration();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      for (String table : tables) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        tableSet.add(table);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  protected static class WALMapper<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      try {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>          TableName targetTable =<a name="line.153"></a>
+<span class="sourceLineNo">154</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>          Put put = null;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          Delete del = null;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          Cell lastCell = null;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>          for (Cell cell : value.getCells()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            // filtering WAL meta entries<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>              continue;<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>            // Allow a subclass filter out this cell.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            if (filter(context, cell)) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.167"></a>
+<span class="sourceLineNo">168</span>              // multiple rows (HBASE-5229).<a name="line.168"></a>
+<span class="sourceLineNo">169</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.169"></a>
+<span class="sourceLineNo">170</span>              // operation before writing to the context.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                // row or type changed, write out aggregate KVs.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                if (put != null) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>                  context.write(tableOut, put);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                }<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                if (del != null) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>                  context.write(tableOut, del);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>                if (CellUtil.isDelete(cell)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>                } else {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.183"></a>
+<span class="sourceLineNo">184</span>                }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>              }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>              if (CellUtil.isDelete(cell)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>                del.add(cell);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>              } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>                put.add(cell);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>              }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>            lastCell = cell;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>          }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          // write residual KVs<a name="line.194"></a>
+<span class="sourceLineNo">195</span>          if (put != null) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            context.write(tableOut, put);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>          }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          if (del != null) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            context.write(tableOut, del);<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>      } catch (InterruptedException e) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        LOG.error("Interrupted while writing results", e);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        Thread.currentThread().interrupt();<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 boolean filter(Context context, final Cell cell) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      return true;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    protected void<a name="line.213"></a>
+<span class="sourceLineNo">214</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            throws IOException, InterruptedException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      super.cleanup(context);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    public void setup(Context context) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      if (tableMap == null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        tableMap = tablesToUse;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if (tablesToUse == null) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        // Then user wants all tables.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      int i = 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (tablesToUse != null) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        for (String table : tablesToUse) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<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>    }<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>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    String val = conf.get(option);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (null == val) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      return;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    long ms;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    try {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      // first try to parse in user friendly form<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    } catch (ParseException pe) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      try {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        // then see if just a number of ms's was specified<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        ms = Long.parseLong(val);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      } catch (NumberFormatException nfe) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        throw new IOException(<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.256"></a>
+<span class="sourceLineNo">257</span>                + "or as number of milliseconds");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    conf.setLong(option, ms);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  /**<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   * Sets up the actual job.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param args The command line parameters.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @return The newly created job.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * @throws IOException When setting up the job fails.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    Configuration conf = getConf();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    String inputDirs = args[0];<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    String[] tables = args[1].split(",");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    String[] tableMap;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    if (args.length &gt; 2) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      tableMap = args[2].split(",");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (tableMap.length != tables.length) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    } else {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      // if not mapping is specified map each table to itself<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      tableMap = tables;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    Job job =<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    job.setJarByClass(WALPlayer.class);<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    if (hfileOutPath != null) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>      // the bulk HFile case<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      job.setReducerClass(CellSortReducer.class);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      Path outputDir = new Path(hfileOutPath);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        for (TableName tableName : tableNames) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          Table table = conn.getTable(tableName);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    } else {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      // output to live cluster<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      job.setMapperClass(WALMapper.class);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      TableMapReduceUtil.initCredentials(job);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // No reducers.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      job.setNumReduceTasks(0);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        Class.forName(codecCls));<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } catch (Exception e) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    return job;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    for (String name : tables) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      list.add(TableName.valueOf(name));<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    return list;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>  }<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>   * Print usage<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * @param errorMsg Error message. Can be null.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  private void usage(final String errorMsg) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      System.err.println("ERROR: " + errorMsg);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    System.err.println("Time range options:");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("Other options:");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    System.err.println("For performance also consider the following options:\n"<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        + "  -Dmapreduce.reduce.speculative=false");<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>   * Main entry point.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @param args The command line parameters.<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @throws Exception When running the job fails.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  public static void main(String[] args) throws Exception {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    System.exit(ret);<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>  @Override<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  public int run(String[] args) throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    if (args.length &lt; 2) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      usage("Wrong number of arguments: " + args.length);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      System.exit(-1);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    Job job = createSubmittableJob(args);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    return job.waitForCompletion(true) ? 0 : 1;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>}<a name="line.398"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
index 2a1eb88..22e5a77 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
@@ -652,7 +652,7 @@
 <span class="sourceLineNo">644</span>      }<a name="line.644"></a>
 <span class="sourceLineNo">645</span><a name="line.645"></a>
 <span class="sourceLineNo">646</span>    } catch (Exception e) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      e.printStackTrace();<a name="line.647"></a>
+<span class="sourceLineNo">647</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.647"></a>
 <span class="sourceLineNo">648</span>      printUsage("Can't start because " + e.getMessage());<a name="line.648"></a>
 <span class="sourceLineNo">649</span>      return false;<a name="line.649"></a>
 <span class="sourceLineNo">650</span>    }<a name="line.650"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
index 2a1eb88..22e5a77 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
@@ -652,7 +652,7 @@
 <span class="sourceLineNo">644</span>      }<a name="line.644"></a>
 <span class="sourceLineNo">645</span><a name="line.645"></a>
 <span class="sourceLineNo">646</span>    } catch (Exception e) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      e.printStackTrace();<a name="line.647"></a>
+<span class="sourceLineNo">647</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.647"></a>
 <span class="sourceLineNo">648</span>      printUsage("Can't start because " + e.getMessage());<a name="line.648"></a>
 <span class="sourceLineNo">649</span>      return false;<a name="line.649"></a>
 <span class="sourceLineNo">650</span>    }<a name="line.650"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.html
index 2a1eb88..22e5a77 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.html
@@ -652,7 +652,7 @@
 <span class="sourceLineNo">644</span>      }<a name="line.644"></a>
 <span class="sourceLineNo">645</span><a name="line.645"></a>
 <span class="sourceLineNo">646</span>    } catch (Exception e) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      e.printStackTrace();<a name="line.647"></a>
+<span class="sourceLineNo">647</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.647"></a>
 <span class="sourceLineNo">648</span>      printUsage("Can't start because " + e.getMessage());<a name="line.648"></a>
 <span class="sourceLineNo">649</span>      return false;<a name="line.649"></a>
 <span class="sourceLineNo">650</span>    }<a name="line.650"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html
index 30fe780..db12a8f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html
@@ -323,7 +323,7 @@
 <span class="sourceLineNo">315</span>        try {<a name="line.315"></a>
 <span class="sourceLineNo">316</span>          this.zkcluster.shutdown();<a name="line.316"></a>
 <span class="sourceLineNo">317</span>        } catch (IOException e) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          e.printStackTrace();<a name="line.318"></a>
+<span class="sourceLineNo">318</span>          LOG.error("Failed to shutdown MiniZooKeeperCluster", e);<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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.html
index 30fe780..db12a8f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMasterCommandLine.html
@@ -323,7 +323,7 @@
 <span class="sourceLineNo">315</span>        try {<a name="line.315"></a>
 <span class="sourceLineNo">316</span>          this.zkcluster.shutdown();<a name="line.316"></a>
 <span class="sourceLineNo">317</span>        } catch (IOException e) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          e.printStackTrace();<a name="line.318"></a>
+<span class="sourceLineNo">318</span>          LOG.error("Failed to shutdown MiniZooKeeperCluster", e);<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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.LockState.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.LockState.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.LockState.html
index 6086d40..3cfacfc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.LockState.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/Procedure.LockState.html
@@ -903,103 +903,108 @@
 <span class="sourceLineNo">895</span>      return;<a name="line.895"></a>
 <span class="sourceLineNo">896</span>    }<a name="line.896"></a>
 <span class="sourceLineNo">897</span><a name="line.897"></a>
-<span class="sourceLineNo">898</span>    LOG.debug("{} held the lock before restarting, call acquireLock to restore it.", this);<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    LockState state = acquireLock(env);<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    assert state == LockState.LOCK_ACQUIRED;<a name="line.900"></a>
-<span class="sourceLineNo">901</span>  }<a name="line.901"></a>
+<span class="sourceLineNo">898</span>    if (isFinished()) {<a name="line.898"></a>
+<span class="sourceLineNo">899</span>      LOG.debug("{} is already finished, skip acquiring lock.", this);<a name="line.899"></a>
+<span class="sourceLineNo">900</span>      return;<a name="line.900"></a>
+<span class="sourceLineNo">901</span>    }<a name="line.901"></a>
 <span class="sourceLineNo">902</span><a name="line.902"></a>
-<span class="sourceLineNo">903</span>  /**<a name="line.903"></a>
-<span class="sourceLineNo">904</span>   * Internal method called by the ProcedureExecutor that starts the user-level code acquireLock().<a name="line.904"></a>
-<span class="sourceLineNo">905</span>   */<a name="line.905"></a>
-<span class="sourceLineNo">906</span>  final LockState doAcquireLock(TEnvironment env, ProcedureStore store) {<a name="line.906"></a>
-<span class="sourceLineNo">907</span>    if (waitInitialized(env)) {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      return LockState.LOCK_EVENT_WAIT;<a name="line.908"></a>
-<span class="sourceLineNo">909</span>    }<a name="line.909"></a>
-<span class="sourceLineNo">910</span>    if (lockedWhenLoading) {<a name="line.910"></a>
-<span class="sourceLineNo">911</span>      // reset it so we will not consider it anymore<a name="line.911"></a>
-<span class="sourceLineNo">912</span>      lockedWhenLoading = false;<a name="line.912"></a>
-<span class="sourceLineNo">913</span>      locked = true;<a name="line.913"></a>
-<span class="sourceLineNo">914</span>      // Here we return without persist the locked state, as lockedWhenLoading is true means<a name="line.914"></a>
-<span class="sourceLineNo">915</span>      // that the locked field of the procedure stored in procedure store is true, so we do not need<a name="line.915"></a>
-<span class="sourceLineNo">916</span>      // to store it again.<a name="line.916"></a>
-<span class="sourceLineNo">917</span>      return LockState.LOCK_ACQUIRED;<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    }<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    LockState state = acquireLock(env);<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    if (state == LockState.LOCK_ACQUIRED) {<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      locked = true;<a name="line.921"></a>
-<span class="sourceLineNo">922</span>      // persist that we have held the lock. This must be done before we actually execute the<a name="line.922"></a>
-<span class="sourceLineNo">923</span>      // procedure, otherwise when restarting, we may consider the procedure does not have a lock,<a name="line.923"></a>
-<span class="sourceLineNo">924</span>      // but it may have already done some changes as we have already executed it, and if another<a name="line.924"></a>
-<span class="sourceLineNo">925</span>      // procedure gets the lock, then the semantic will be broken if the holdLock is true, as we do<a name="line.925"></a>
-<span class="sourceLineNo">926</span>      // not expect that another procedure can be executed in the middle.<a name="line.926"></a>
-<span class="sourceLineNo">927</span>      store.update(this);<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    }<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    return state;<a name="line.929"></a>
-<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span>  /**<a name="line.932"></a>
-<span class="sourceLineNo">933</span>   * Internal method called by the ProcedureExecutor that starts the user-level code releaseLock().<a name="line.933"></a>
-<span class="sourceLineNo">934</span>   */<a name="line.934"></a>
-<span class="sourceLineNo">935</span>  final void doReleaseLock(TEnvironment env, ProcedureStore store) {<a name="line.935"></a>
-<span class="sourceLineNo">936</span>    locked = false;<a name="line.936"></a>
-<span class="sourceLineNo">937</span>    // persist that we have released the lock. This must be done before we actually release the<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    // lock. Another procedure may take this lock immediately after we release the lock, and if we<a name="line.938"></a>
-<span class="sourceLineNo">939</span>    // crash before persist the information that we have already released the lock, then when<a name="line.939"></a>
-<span class="sourceLineNo">940</span>    // restarting there will be two procedures which both have the lock and cause problems.<a name="line.940"></a>
-<span class="sourceLineNo">941</span>    if (getState() != ProcedureState.ROLLEDBACK) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>      // If the state is ROLLEDBACK, it means that we have already deleted the procedure from<a name="line.942"></a>
-<span class="sourceLineNo">943</span>      // procedure store, so do not need to log the release operation any more.<a name="line.943"></a>
-<span class="sourceLineNo">944</span>      store.update(this);<a name="line.944"></a>
-<span class="sourceLineNo">945</span>    }<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    releaseLock(env);<a name="line.946"></a>
-<span class="sourceLineNo">947</span>  }<a name="line.947"></a>
-<span class="sourceLineNo">948</span><a name="line.948"></a>
-<span class="sourceLineNo">949</span>  @Override<a name="line.949"></a>
-<span class="sourceLineNo">950</span>  public int compareTo(final Procedure&lt;TEnvironment&gt; other) {<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    return Long.compare(getProcId(), other.getProcId());<a name="line.951"></a>
+<span class="sourceLineNo">903</span>    LOG.debug("{} held the lock before restarting, call acquireLock to restore it.", this);<a name="line.903"></a>
+<span class="sourceLineNo">904</span>    LockState state = acquireLock(env);<a name="line.904"></a>
+<span class="sourceLineNo">905</span>    assert state == LockState.LOCK_ACQUIRED;<a name="line.905"></a>
+<span class="sourceLineNo">906</span>  }<a name="line.906"></a>
+<span class="sourceLineNo">907</span><a name="line.907"></a>
+<span class="sourceLineNo">908</span>  /**<a name="line.908"></a>
+<span class="sourceLineNo">909</span>   * Internal method called by the ProcedureExecutor that starts the user-level code acquireLock().<a name="line.909"></a>
+<span class="sourceLineNo">910</span>   */<a name="line.910"></a>
+<span class="sourceLineNo">911</span>  final LockState doAcquireLock(TEnvironment env, ProcedureStore store) {<a name="line.911"></a>
+<span class="sourceLineNo">912</span>    if (waitInitialized(env)) {<a name="line.912"></a>
+<span class="sourceLineNo">913</span>      return LockState.LOCK_EVENT_WAIT;<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    }<a name="line.914"></a>
+<span class="sourceLineNo">915</span>    if (lockedWhenLoading) {<a name="line.915"></a>
+<span class="sourceLineNo">916</span>      // reset it so we will not consider it anymore<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      lockedWhenLoading = false;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>      locked = true;<a name="line.918"></a>
+<span class="sourceLineNo">919</span>      // Here we return without persist the locked state, as lockedWhenLoading is true means<a name="line.919"></a>
+<span class="sourceLineNo">920</span>      // that the locked field of the procedure stored in procedure store is true, so we do not need<a name="line.920"></a>
+<span class="sourceLineNo">921</span>      // to store it again.<a name="line.921"></a>
+<span class="sourceLineNo">922</span>      return LockState.LOCK_ACQUIRED;<a name="line.922"></a>
+<span class="sourceLineNo">923</span>    }<a name="line.923"></a>
+<span class="sourceLineNo">924</span>    LockState state = acquireLock(env);<a name="line.924"></a>
+<span class="sourceLineNo">925</span>    if (state == LockState.LOCK_ACQUIRED) {<a name="line.925"></a>
+<span class="sourceLineNo">926</span>      locked = true;<a name="line.926"></a>
+<span class="sourceLineNo">927</span>      // persist that we have held the lock. This must be done before we actually execute the<a name="line.927"></a>
+<span class="sourceLineNo">928</span>      // procedure, otherwise when restarting, we may consider the procedure does not have a lock,<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      // but it may have already done some changes as we have already executed it, and if another<a name="line.929"></a>
+<span class="sourceLineNo">930</span>      // procedure gets the lock, then the semantic will be broken if the holdLock is true, as we do<a name="line.930"></a>
+<span class="sourceLineNo">931</span>      // not expect that another procedure can be executed in the middle.<a name="line.931"></a>
+<span class="sourceLineNo">932</span>      store.update(this);<a name="line.932"></a>
+<span class="sourceLineNo">933</span>    }<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    return state;<a name="line.934"></a>
+<span class="sourceLineNo">935</span>  }<a name="line.935"></a>
+<span class="sourceLineNo">936</span><a name="line.936"></a>
+<span class="sourceLineNo">937</span>  /**<a name="line.937"></a>
+<span class="sourceLineNo">938</span>   * Internal method called by the ProcedureExecutor that starts the user-level code releaseLock().<a name="line.938"></a>
+<span class="sourceLineNo">939</span>   */<a name="line.939"></a>
+<span class="sourceLineNo">940</span>  final void doReleaseLock(TEnvironment env, ProcedureStore store) {<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    locked = false;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    // persist that we have released the lock. This must be done before we actually release the<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    // lock. Another procedure may take this lock immediately after we release the lock, and if we<a name="line.943"></a>
+<span class="sourceLineNo">944</span>    // crash before persist the information that we have already released the lock, then when<a name="line.944"></a>
+<span class="sourceLineNo">945</span>    // restarting there will be two procedures which both have the lock and cause problems.<a name="line.945"></a>
+<span class="sourceLineNo">946</span>    if (getState() != ProcedureState.ROLLEDBACK) {<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      // If the state is ROLLEDBACK, it means that we have already deleted the procedure from<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      // procedure store, so do not need to log the release operation any more.<a name="line.948"></a>
+<span class="sourceLineNo">949</span>      store.update(this);<a name="line.949"></a>
+<span class="sourceLineNo">950</span>    }<a name="line.950"></a>
+<span class="sourceLineNo">951</span>    releaseLock(env);<a name="line.951"></a>
 <span class="sourceLineNo">952</span>  }<a name="line.952"></a>
 <span class="sourceLineNo">953</span><a name="line.953"></a>
-<span class="sourceLineNo">954</span>  // ==========================================================================<a name="line.954"></a>
-<span class="sourceLineNo">955</span>  //  misc utils<a name="line.955"></a>
-<span class="sourceLineNo">956</span>  // ==========================================================================<a name="line.956"></a>
-<span class="sourceLineNo">957</span><a name="line.957"></a>
-<span class="sourceLineNo">958</span>  /**<a name="line.958"></a>
-<span class="sourceLineNo">959</span>   * Get an hashcode for the specified Procedure ID<a name="line.959"></a>
-<span class="sourceLineNo">960</span>   * @return the hashcode for the specified procId<a name="line.960"></a>
-<span class="sourceLineNo">961</span>   */<a name="line.961"></a>
-<span class="sourceLineNo">962</span>  public static long getProcIdHashCode(long procId) {<a name="line.962"></a>
-<span class="sourceLineNo">963</span>    long h = procId;<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    h ^= h &gt;&gt; 16;<a name="line.964"></a>
-<span class="sourceLineNo">965</span>    h *= 0x85ebca6b;<a name="line.965"></a>
-<span class="sourceLineNo">966</span>    h ^= h &gt;&gt; 13;<a name="line.966"></a>
-<span class="sourceLineNo">967</span>    h *= 0xc2b2ae35;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>    h ^= h &gt;&gt; 16;<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    return h;<a name="line.969"></a>
-<span class="sourceLineNo">970</span>  }<a name="line.970"></a>
-<span class="sourceLineNo">971</span><a name="line.971"></a>
-<span class="sourceLineNo">972</span>  /**<a name="line.972"></a>
-<span class="sourceLineNo">973</span>   * Helper to lookup the root Procedure ID given a specified procedure.<a name="line.973"></a>
-<span class="sourceLineNo">974</span>   */<a name="line.974"></a>
-<span class="sourceLineNo">975</span>  protected static &lt;T&gt; Long getRootProcedureId(Map&lt;Long, Procedure&lt;T&gt;&gt; procedures,<a name="line.975"></a>
-<span class="sourceLineNo">976</span>      Procedure&lt;T&gt; proc) {<a name="line.976"></a>
-<span class="sourceLineNo">977</span>    while (proc.hasParent()) {<a name="line.977"></a>
-<span class="sourceLineNo">978</span>      proc = procedures.get(proc.getParentProcId());<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      if (proc == null) {<a name="line.979"></a>
-<span class="sourceLineNo">980</span>        return null;<a name="line.980"></a>
-<span class="sourceLineNo">981</span>      }<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    }<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    return proc.getProcId();<a name="line.983"></a>
-<span class="sourceLineNo">984</span>  }<a name="line.984"></a>
-<span class="sourceLineNo">985</span><a name="line.985"></a>
-<span class="sourceLineNo">986</span>  /**<a name="line.986"></a>
-<span class="sourceLineNo">987</span>   * @param a the first procedure to be compared.<a name="line.987"></a>
-<span class="sourceLineNo">988</span>   * @param b the second procedure to be compared.<a name="line.988"></a>
-<span class="sourceLineNo">989</span>   * @return true if the two procedures have the same parent<a name="line.989"></a>
-<span class="sourceLineNo">990</span>   */<a name="line.990"></a>
-<span class="sourceLineNo">991</span>  public static boolean haveSameParent(Procedure&lt;?&gt; a, Procedure&lt;?&gt; b) {<a name="line.991"></a>
-<span class="sourceLineNo">992</span>    return a.hasParent() &amp;&amp; b.hasParent() &amp;&amp; (a.getParentProcId() == b.getParentProcId());<a name="line.992"></a>
-<span class="sourceLineNo">993</span>  }<a name="line.993"></a>
-<span class="sourceLineNo">994</span>}<a name="line.994"></a>
+<span class="sourceLineNo">954</span>  @Override<a name="line.954"></a>
+<span class="sourceLineNo">955</span>  public int compareTo(final Procedure&lt;TEnvironment&gt; other) {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>    return Long.compare(getProcId(), other.getProcId());<a name="line.956"></a>
+<span class="sourceLineNo">957</span>  }<a name="line.957"></a>
+<span class="sourceLineNo">958</span><a name="line.958"></a>
+<span class="sourceLineNo">959</span>  // ==========================================================================<a name="line.959"></a>
+<span class="sourceLineNo">960</span>  //  misc utils<a name="line.960"></a>
+<span class="sourceLineNo">961</span>  // ==========================================================================<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span>  /**<a name="line.963"></a>
+<span class="sourceLineNo">964</span>   * Get an hashcode for the specified Procedure ID<a name="line.964"></a>
+<span class="sourceLineNo">965</span>   * @return the hashcode for the specified procId<a name="line.965"></a>
+<span class="sourceLineNo">966</span>   */<a name="line.966"></a>
+<span class="sourceLineNo">967</span>  public static long getProcIdHashCode(long procId) {<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    long h = procId;<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    h ^= h &gt;&gt; 16;<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    h *= 0x85ebca6b;<a name="line.970"></a>
+<span class="sourceLineNo">971</span>    h ^= h &gt;&gt; 13;<a name="line.971"></a>
+<span class="sourceLineNo">972</span>    h *= 0xc2b2ae35;<a name="line.972"></a>
+<span class="sourceLineNo">973</span>    h ^= h &gt;&gt; 16;<a name="line.973"></a>
+<span class="sourceLineNo">974</span>    return h;<a name="line.974"></a>
+<span class="sourceLineNo">975</span>  }<a name="line.975"></a>
+<span class="sourceLineNo">976</span><a name="line.976"></a>
+<span class="sourceLineNo">977</span>  /**<a name="line.977"></a>
+<span class="sourceLineNo">978</span>   * Helper to lookup the root Procedure ID given a specified procedure.<a name="line.978"></a>
+<span class="sourceLineNo">979</span>   */<a name="line.979"></a>
+<span class="sourceLineNo">980</span>  protected static &lt;T&gt; Long getRootProcedureId(Map&lt;Long, Procedure&lt;T&gt;&gt; procedures,<a name="line.980"></a>
+<span class="sourceLineNo">981</span>      Procedure&lt;T&gt; proc) {<a name="line.981"></a>
+<span class="sourceLineNo">982</span>    while (proc.hasParent()) {<a name="line.982"></a>
+<span class="sourceLineNo">983</span>      proc = procedures.get(proc.getParentProcId());<a name="line.983"></a>
+<span class="sourceLineNo">984</span>      if (proc == null) {<a name="line.984"></a>
+<span class="sourceLineNo">985</span>        return null;<a name="line.985"></a>
+<span class="sourceLineNo">986</span>      }<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    }<a name="line.987"></a>
+<span class="sourceLineNo">988</span>    return proc.getProcId();<a name="line.988"></a>
+<span class="sourceLineNo">989</span>  }<a name="line.989"></a>
+<span class="sourceLineNo">990</span><a name="line.990"></a>
+<span class="sourceLineNo">991</span>  /**<a name="line.991"></a>
+<span class="sourceLineNo">992</span>   * @param a the first procedure to be compared.<a name="line.992"></a>
+<span class="sourceLineNo">993</span>   * @param b the second procedure to be compared.<a name="line.993"></a>
+<span class="sourceLineNo">994</span>   * @return true if the two procedures have the same parent<a name="line.994"></a>
+<span class="sourceLineNo">995</span>   */<a name="line.995"></a>
+<span class="sourceLineNo">996</span>  public static boolean haveSameParent(Procedure&lt;?&gt; a, Procedure&lt;?&gt; b) {<a name="line.996"></a>
+<span class="sourceLineNo">997</span>    return a.hasParent() &amp;&amp; b.hasParent() &amp;&amp; (a.getParentProcId() == b.getParentProcId());<a name="line.997"></a>
+<span class="sourceLineNo">998</span>  }<a name="line.998"></a>
+<span class="sourceLineNo">999</span>}<a name="line.999"></a>
 
 
 


[12/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[47/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
index 6f1fc1b..fbfe15d 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
@@ -184,165 +184,166 @@
 <span class="sourceLineNo">176</span>          context.getCounter(Counters.CELLS).increment(cellCount);<a name="line.176"></a>
 <span class="sourceLineNo">177</span>        }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>      } catch (InterruptedException e) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        e.printStackTrace();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      Key, IntWritable&gt; {<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    private IntWritable result = new IntWritable();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      Context context)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    throws IOException, InterruptedException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      int sum = 0;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      for (IntWritable val : values) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        sum += val.get();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      result.set(sum);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      context.write(key, result);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * Sets up the actual job.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @param conf The current configuration.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param args The command line parameters.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return The newly created job.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @throws IOException When setting up the job fails.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    String tableName = args[0];<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    Path outputDir = new Path(args[1]);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    job.setJarByClass(CellCounter.class);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    job.setNumReduceTasks(1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    job.setMapOutputKeyClass(Text.class);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    job.setOutputKeyClass(Text.class);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    job.setOutputValueClass(IntWritable.class);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    job.setReducerClass(IntSumReducer.class);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    return job;<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>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // create scan with any properties set from TableInputFormat<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // Set Scan Versions<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      // default to all versions unless explicitly set<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    s.setCacheBlocks(false);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Filter rowFilter = getRowFilter(args);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (rowFilter!= null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      LOG.info("Setting Row Filter for counter.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      s.setFilter(rowFilter);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // Set TimeRange if defined<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    long timeRange[] = getTimeRange(args);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    if (timeRange != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      LOG.info("Setting TimeRange for counter.");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    return s;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">179</span>        LOG.error("Interrupted while writing cellCount", e);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        Thread.currentThread().interrupt();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Key, IntWritable&gt; {<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    private IntWritable result = new IntWritable();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      Context context)<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    throws IOException, InterruptedException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      int sum = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (IntWritable val : values) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        sum += val.get();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      result.set(sum);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      context.write(key, result);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Sets up the actual job.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @param conf The current configuration.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param args The command line parameters.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @return The newly created job.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @throws IOException When setting up the job fails.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    String tableName = args[0];<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    Path outputDir = new Path(args[1]);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    job.setJarByClass(CellCounter.class);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    job.setNumReduceTasks(1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    job.setMapOutputKeyClass(Text.class);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    job.setOutputKeyClass(Text.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    job.setOutputValueClass(IntWritable.class);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    job.setReducerClass(IntSumReducer.class);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    return job;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      throws IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // create scan with any properties set from TableInputFormat<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // Set Scan Versions<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      // default to all versions unless explicitly set<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    s.setCacheBlocks(false);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    Filter rowFilter = getRowFilter(args);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (rowFilter!= null) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      LOG.info("Setting Row Filter for counter.");<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      s.setFilter(rowFilter);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // Set TimeRange if defined<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    long timeRange[] = getTimeRange(args);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    if (timeRange != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      LOG.info("Setting TimeRange for counter.");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    return s;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
 <span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  private static Filter getRowFilter(String[] args) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    Filter rowFilter = null;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (filterCriteria == null) return null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    if (filterCriteria.startsWith("^")) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    return rowFilter;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    final String startTimeArgKey = "--starttime=";<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    final String endTimeArgKey = "--endtime=";<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    long startTime = 0L;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    long endTime = 0L;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return new long [] {startTime, endTime};<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public int run(String[] args) throws Exception {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (args.length &lt; 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      printUsage(args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return -1;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  private void printUsage(int parameterCount) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        + "prefix pattern.");<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * Main entry point.<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param args The command line parameters.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @throws Exception When running the job fails.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public static void main(String[] args) throws Exception {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    System.exit(errCode);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<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">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>  private static Filter getRowFilter(String[] args) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    Filter rowFilter = null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (filterCriteria == null) return null;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    if (filterCriteria.startsWith("^")) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } else {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    return rowFilter;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final String startTimeArgKey = "--starttime=";<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    final String endTimeArgKey = "--endtime=";<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    long startTime = 0L;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    long endTime = 0L;<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    return new long [] {startTime, endTime};<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>  @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  public int run(String[] args) throws Exception {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (args.length &lt; 2) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      printUsage(args.length);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>
+<span class="sourceLineNo">303</span>  private void printUsage(int parameterCount) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        + "specified to get fine grained control on what is counted.");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        + "prefix pattern.");<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * Main entry point.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param args The command line parameters.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @throws Exception When running the job fails.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void main(String[] args) throws Exception {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    System.exit(errCode);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
index f7c1cae..56eaf18 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
@@ -347,7 +347,7 @@
 <span class="sourceLineNo">339</span>        dstTableName = tableName;<a name="line.339"></a>
 <span class="sourceLineNo">340</span>      }<a name="line.340"></a>
 <span class="sourceLineNo">341</span>    } catch (Exception e) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      e.printStackTrace();<a name="line.342"></a>
+<span class="sourceLineNo">342</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.342"></a>
 <span class="sourceLineNo">343</span>      printUsage("Can't start because " + e.getMessage());<a name="line.343"></a>
 <span class="sourceLineNo">344</span>      return false;<a name="line.344"></a>
 <span class="sourceLineNo">345</span>    }<a name="line.345"></a>


[33/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
index 6f1fc1b..fbfe15d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
@@ -184,165 +184,166 @@
 <span class="sourceLineNo">176</span>          context.getCounter(Counters.CELLS).increment(cellCount);<a name="line.176"></a>
 <span class="sourceLineNo">177</span>        }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>      } catch (InterruptedException e) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        e.printStackTrace();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      Key, IntWritable&gt; {<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    private IntWritable result = new IntWritable();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      Context context)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    throws IOException, InterruptedException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      int sum = 0;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      for (IntWritable val : values) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        sum += val.get();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      result.set(sum);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      context.write(key, result);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * Sets up the actual job.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @param conf The current configuration.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param args The command line parameters.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return The newly created job.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @throws IOException When setting up the job fails.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    String tableName = args[0];<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    Path outputDir = new Path(args[1]);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    job.setJarByClass(CellCounter.class);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    job.setNumReduceTasks(1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    job.setMapOutputKeyClass(Text.class);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    job.setOutputKeyClass(Text.class);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    job.setOutputValueClass(IntWritable.class);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    job.setReducerClass(IntSumReducer.class);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    return job;<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>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // create scan with any properties set from TableInputFormat<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // Set Scan Versions<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      // default to all versions unless explicitly set<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    s.setCacheBlocks(false);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Filter rowFilter = getRowFilter(args);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (rowFilter!= null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      LOG.info("Setting Row Filter for counter.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      s.setFilter(rowFilter);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // Set TimeRange if defined<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    long timeRange[] = getTimeRange(args);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    if (timeRange != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      LOG.info("Setting TimeRange for counter.");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    return s;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">179</span>        LOG.error("Interrupted while writing cellCount", e);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        Thread.currentThread().interrupt();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Key, IntWritable&gt; {<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    private IntWritable result = new IntWritable();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      Context context)<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    throws IOException, InterruptedException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      int sum = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (IntWritable val : values) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        sum += val.get();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      result.set(sum);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      context.write(key, result);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Sets up the actual job.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @param conf The current configuration.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param args The command line parameters.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @return The newly created job.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @throws IOException When setting up the job fails.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    String tableName = args[0];<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    Path outputDir = new Path(args[1]);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    job.setJarByClass(CellCounter.class);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    job.setNumReduceTasks(1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    job.setMapOutputKeyClass(Text.class);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    job.setOutputKeyClass(Text.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    job.setOutputValueClass(IntWritable.class);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    job.setReducerClass(IntSumReducer.class);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    return job;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      throws IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // create scan with any properties set from TableInputFormat<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // Set Scan Versions<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      // default to all versions unless explicitly set<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    s.setCacheBlocks(false);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    Filter rowFilter = getRowFilter(args);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (rowFilter!= null) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      LOG.info("Setting Row Filter for counter.");<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      s.setFilter(rowFilter);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // Set TimeRange if defined<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    long timeRange[] = getTimeRange(args);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    if (timeRange != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      LOG.info("Setting TimeRange for counter.");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    return s;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
 <span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  private static Filter getRowFilter(String[] args) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    Filter rowFilter = null;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (filterCriteria == null) return null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    if (filterCriteria.startsWith("^")) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    return rowFilter;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    final String startTimeArgKey = "--starttime=";<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    final String endTimeArgKey = "--endtime=";<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    long startTime = 0L;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    long endTime = 0L;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return new long [] {startTime, endTime};<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public int run(String[] args) throws Exception {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (args.length &lt; 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      printUsage(args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return -1;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  private void printUsage(int parameterCount) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        + "prefix pattern.");<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * Main entry point.<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param args The command line parameters.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @throws Exception When running the job fails.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public static void main(String[] args) throws Exception {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    System.exit(errCode);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<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">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>  private static Filter getRowFilter(String[] args) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    Filter rowFilter = null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (filterCriteria == null) return null;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    if (filterCriteria.startsWith("^")) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } else {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    return rowFilter;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final String startTimeArgKey = "--starttime=";<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    final String endTimeArgKey = "--endtime=";<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    long startTime = 0L;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    long endTime = 0L;<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    return new long [] {startTime, endTime};<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>  @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  public int run(String[] args) throws Exception {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (args.length &lt; 2) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      printUsage(args.length);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>
+<span class="sourceLineNo">303</span>  private void printUsage(int parameterCount) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        + "specified to get fine grained control on what is counted.");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        + "prefix pattern.");<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * Main entry point.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param args The command line parameters.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @throws Exception When running the job fails.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void main(String[] args) throws Exception {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    System.exit(errCode);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
index 6f1fc1b..fbfe15d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
@@ -184,165 +184,166 @@
 <span class="sourceLineNo">176</span>          context.getCounter(Counters.CELLS).increment(cellCount);<a name="line.176"></a>
 <span class="sourceLineNo">177</span>        }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>      } catch (InterruptedException e) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        e.printStackTrace();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      Key, IntWritable&gt; {<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    private IntWritable result = new IntWritable();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      Context context)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    throws IOException, InterruptedException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      int sum = 0;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      for (IntWritable val : values) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        sum += val.get();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      result.set(sum);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      context.write(key, result);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * Sets up the actual job.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @param conf The current configuration.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param args The command line parameters.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return The newly created job.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @throws IOException When setting up the job fails.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    String tableName = args[0];<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    Path outputDir = new Path(args[1]);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    job.setJarByClass(CellCounter.class);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    job.setNumReduceTasks(1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    job.setMapOutputKeyClass(Text.class);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    job.setOutputKeyClass(Text.class);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    job.setOutputValueClass(IntWritable.class);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    job.setReducerClass(IntSumReducer.class);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    return job;<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>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // create scan with any properties set from TableInputFormat<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // Set Scan Versions<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      // default to all versions unless explicitly set<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    s.setCacheBlocks(false);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Filter rowFilter = getRowFilter(args);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (rowFilter!= null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      LOG.info("Setting Row Filter for counter.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      s.setFilter(rowFilter);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // Set TimeRange if defined<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    long timeRange[] = getTimeRange(args);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    if (timeRange != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      LOG.info("Setting TimeRange for counter.");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    return s;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">179</span>        LOG.error("Interrupted while writing cellCount", e);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        Thread.currentThread().interrupt();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Key, IntWritable&gt; {<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    private IntWritable result = new IntWritable();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      Context context)<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    throws IOException, InterruptedException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      int sum = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (IntWritable val : values) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        sum += val.get();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      result.set(sum);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      context.write(key, result);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Sets up the actual job.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @param conf The current configuration.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param args The command line parameters.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @return The newly created job.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @throws IOException When setting up the job fails.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    String tableName = args[0];<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    Path outputDir = new Path(args[1]);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    job.setJarByClass(CellCounter.class);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    job.setNumReduceTasks(1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    job.setMapOutputKeyClass(Text.class);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    job.setOutputKeyClass(Text.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    job.setOutputValueClass(IntWritable.class);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    job.setReducerClass(IntSumReducer.class);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    return job;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      throws IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // create scan with any properties set from TableInputFormat<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // Set Scan Versions<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      // default to all versions unless explicitly set<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    s.setCacheBlocks(false);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    Filter rowFilter = getRowFilter(args);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (rowFilter!= null) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      LOG.info("Setting Row Filter for counter.");<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      s.setFilter(rowFilter);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // Set TimeRange if defined<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    long timeRange[] = getTimeRange(args);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    if (timeRange != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      LOG.info("Setting TimeRange for counter.");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    return s;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
 <span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  private static Filter getRowFilter(String[] args) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    Filter rowFilter = null;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (filterCriteria == null) return null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    if (filterCriteria.startsWith("^")) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    return rowFilter;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    final String startTimeArgKey = "--starttime=";<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    final String endTimeArgKey = "--endtime=";<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    long startTime = 0L;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    long endTime = 0L;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return new long [] {startTime, endTime};<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public int run(String[] args) throws Exception {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (args.length &lt; 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      printUsage(args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return -1;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  private void printUsage(int parameterCount) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        + "prefix pattern.");<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * Main entry point.<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param args The command line parameters.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @throws Exception When running the job fails.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public static void main(String[] args) throws Exception {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    System.exit(errCode);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<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">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>  private static Filter getRowFilter(String[] args) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    Filter rowFilter = null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (filterCriteria == null) return null;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    if (filterCriteria.startsWith("^")) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } else {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    return rowFilter;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final String startTimeArgKey = "--starttime=";<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    final String endTimeArgKey = "--endtime=";<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    long startTime = 0L;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    long endTime = 0L;<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    return new long [] {startTime, endTime};<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>  @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  public int run(String[] args) throws Exception {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (args.length &lt; 2) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      printUsage(args.length);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>
+<span class="sourceLineNo">303</span>  private void printUsage(int parameterCount) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        + "specified to get fine grained control on what is counted.");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        + "prefix pattern.");<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * Main entry point.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param args The command line parameters.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @throws Exception When running the job fails.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void main(String[] args) throws Exception {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    System.exit(errCode);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
index f7c1cae..56eaf18 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html
@@ -347,7 +347,7 @@
 <span class="sourceLineNo">339</span>        dstTableName = tableName;<a name="line.339"></a>
 <span class="sourceLineNo">340</span>      }<a name="line.340"></a>
 <span class="sourceLineNo">341</span>    } catch (Exception e) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      e.printStackTrace();<a name="line.342"></a>
+<span class="sourceLineNo">342</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.342"></a>
 <span class="sourceLineNo">343</span>      printUsage("Can't start because " + e.getMessage());<a name="line.343"></a>
 <span class="sourceLineNo">344</span>      return false;<a name="line.344"></a>
 <span class="sourceLineNo">345</span>    }<a name="line.345"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.HashMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.HashMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.HashMapper.html
index 3d9668d..fb20d15 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.HashMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.HashMapper.html
@@ -721,7 +721,7 @@
 <span class="sourceLineNo">713</span>      }<a name="line.713"></a>
 <span class="sourceLineNo">714</span><a name="line.714"></a>
 <span class="sourceLineNo">715</span>    } catch (Exception e) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      e.printStackTrace();<a name="line.716"></a>
+<span class="sourceLineNo">716</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.716"></a>
 <span class="sourceLineNo">717</span>      printUsage("Can't start because " + e.getMessage());<a name="line.717"></a>
 <span class="sourceLineNo">718</span>      return false;<a name="line.718"></a>
 <span class="sourceLineNo">719</span>    }<a name="line.719"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.ResultHasher.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.ResultHasher.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.ResultHasher.html
index 3d9668d..fb20d15 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.ResultHasher.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.ResultHasher.html
@@ -721,7 +721,7 @@
 <span class="sourceLineNo">713</span>      }<a name="line.713"></a>
 <span class="sourceLineNo">714</span><a name="line.714"></a>
 <span class="sourceLineNo">715</span>    } catch (Exception e) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      e.printStackTrace();<a name="line.716"></a>
+<span class="sourceLineNo">716</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.716"></a>
 <span class="sourceLineNo">717</span>      printUsage("Can't start because " + e.getMessage());<a name="line.717"></a>
 <span class="sourceLineNo">718</span>      return false;<a name="line.718"></a>
 <span class="sourceLineNo">719</span>    }<a name="line.719"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.Reader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.Reader.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.Reader.html
index 3d9668d..fb20d15 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.Reader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.Reader.html
@@ -721,7 +721,7 @@
 <span class="sourceLineNo">713</span>      }<a name="line.713"></a>
 <span class="sourceLineNo">714</span><a name="line.714"></a>
 <span class="sourceLineNo">715</span>    } catch (Exception e) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      e.printStackTrace();<a name="line.716"></a>
+<span class="sourceLineNo">716</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.716"></a>
 <span class="sourceLineNo">717</span>      printUsage("Can't start because " + e.getMessage());<a name="line.717"></a>
 <span class="sourceLineNo">718</span>      return false;<a name="line.718"></a>
 <span class="sourceLineNo">719</span>    }<a name="line.719"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.html
index 3d9668d..fb20d15 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.TableHash.html
@@ -721,7 +721,7 @@
 <span class="sourceLineNo">713</span>      }<a name="line.713"></a>
 <span class="sourceLineNo">714</span><a name="line.714"></a>
 <span class="sourceLineNo">715</span>    } catch (Exception e) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      e.printStackTrace();<a name="line.716"></a>
+<span class="sourceLineNo">716</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.716"></a>
 <span class="sourceLineNo">717</span>      printUsage("Can't start because " + e.getMessage());<a name="line.717"></a>
 <span class="sourceLineNo">718</span>      return false;<a name="line.718"></a>
 <span class="sourceLineNo">719</span>    }<a name="line.719"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.html
index 3d9668d..fb20d15 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HashTable.html
@@ -721,7 +721,7 @@
 <span class="sourceLineNo">713</span>      }<a name="line.713"></a>
 <span class="sourceLineNo">714</span><a name="line.714"></a>
 <span class="sourceLineNo">715</span>    } catch (Exception e) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      e.printStackTrace();<a name="line.716"></a>
+<span class="sourceLineNo">716</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.716"></a>
 <span class="sourceLineNo">717</span>      printUsage("Can't start because " + e.getMessage());<a name="line.717"></a>
 <span class="sourceLineNo">718</span>      return false;<a name="line.718"></a>
 <span class="sourceLineNo">719</span>    }<a name="line.719"></a>


[18/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
index b87dfff..0480193 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
@@ -61,238 +61,241 @@
 <span class="sourceLineNo">053</span>import org.ietf.jgss.GSSManager;<a name="line.53"></a>
 <span class="sourceLineNo">054</span>import org.ietf.jgss.GSSName;<a name="line.54"></a>
 <span class="sourceLineNo">055</span>import org.ietf.jgss.Oid;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>/**<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * See the instructions under hbase-examples/README.txt<a name="line.58"></a>
-<span class="sourceLineNo">059</span> */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>@InterfaceAudience.Private<a name="line.60"></a>
-<span class="sourceLineNo">061</span>public class HttpDoAsClient {<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  static protected int port;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  static protected String host;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  CharsetDecoder decoder = null;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  private static boolean secure = false;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  static protected String doAsUser = null;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  static protected String principal = null;<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public static void main(String[] args) throws Exception {<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>    if (args.length &lt; 3 || args.length &gt; 4) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>      System.out.println("Invalid arguments!");<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      System.out.println("Usage: HttpDoAsClient host port doAsUserName [security=true]");<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      System.exit(-1);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>    host = args[0];<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    port = Integer.parseInt(args[1]);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    doAsUser = args[2];<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    if (args.length &gt; 3) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      secure = Boolean.parseBoolean(args[3]);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      principal = getSubject().getPrincipals().iterator().next().getName();<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>    final HttpDoAsClient client = new HttpDoAsClient();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    Subject.doAs(getSubject(),<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        new PrivilegedExceptionAction&lt;Void&gt;() {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>          @Override<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          public Void run() throws Exception {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            client.run();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>            return null;<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>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  HttpDoAsClient() {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    decoder = Charset.forName("UTF-8").newDecoder();<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>  // Helper to translate byte[]'s to UTF8 strings<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  private String utf8(byte[] buf) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    try {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      return decoder.decode(ByteBuffer.wrap(buf)).toString();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    } catch (CharacterCodingException e) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      return "[INVALID UTF-8]";<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  // Helper to translate strings to UTF8 bytes<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  private byte[] bytes(String s) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    try {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      return s.getBytes("UTF-8");<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    } catch (UnsupportedEncodingException e) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      e.printStackTrace();<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      return null;<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><a name="line.120"></a>
-<span class="sourceLineNo">121</span>  private void run() throws Exception {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    TTransport transport = new TSocket(host, port);<a name="line.122"></a>
+<span class="sourceLineNo">056</span>import org.slf4j.Logger;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.LoggerFactory;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>/**<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * See the instructions under hbase-examples/README.txt<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>@InterfaceAudience.Private<a name="line.62"></a>
+<span class="sourceLineNo">063</span>public class HttpDoAsClient {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  private static final Logger LOG = LoggerFactory.getLogger(HttpDoAsClient.class);<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  static protected int port;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  static protected String host;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  CharsetDecoder decoder = null;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  private static boolean secure = false;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  static protected String doAsUser = null;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  static protected String principal = null;<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public static void main(String[] args) throws Exception {<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    if (args.length &lt; 3 || args.length &gt; 4) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>      System.out.println("Invalid arguments!");<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      System.out.println("Usage: HttpDoAsClient host port doAsUserName [security=true]");<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      System.exit(-1);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>    host = args[0];<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    port = Integer.parseInt(args[1]);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    doAsUser = args[2];<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    if (args.length &gt; 3) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      secure = Boolean.parseBoolean(args[3]);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      principal = getSubject().getPrincipals().iterator().next().getName();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>    final HttpDoAsClient client = new HttpDoAsClient();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    Subject.doAs(getSubject(),<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        new PrivilegedExceptionAction&lt;Void&gt;() {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>          @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          public Void run() throws Exception {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>            client.run();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            return null;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>          }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        });<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  HttpDoAsClient() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    decoder = Charset.forName("UTF-8").newDecoder();<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  // Helper to translate byte[]'s to UTF8 strings<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  private String utf8(byte[] buf) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    try {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      return decoder.decode(ByteBuffer.wrap(buf)).toString();<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    } catch (CharacterCodingException e) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      return "[INVALID UTF-8]";<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>  // Helper to translate strings to UTF8 bytes<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  private byte[] bytes(String s) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    try {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      return s.getBytes("UTF-8");<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    } catch (UnsupportedEncodingException e) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      LOG.error("CharSetName {} not supported", s, e);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      return null;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>    transport.open();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    String url = "http://" + host + ":" + port;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    THttpClient httpClient = new THttpClient(url);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    httpClient.open();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    TProtocol protocol = new TBinaryProtocol(httpClient);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    Hbase.Client client = new Hbase.Client(protocol);<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    byte[] t = bytes("demo_table");<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    //<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    // Scan all tables, look for the demo table and delete it.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    //<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    System.out.println("scanning tables...");<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    for (ByteBuffer name : refresh(client, httpClient).getTableNames()) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      System.out.println("  found: " + utf8(name.array()));<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      if (utf8(name.array()).equals(utf8(t))) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        if (refresh(client, httpClient).isTableEnabled(name)) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>          System.out.println("    disabling table: " + utf8(name.array()));<a name="line.141"></a>
-<span class="sourceLineNo">142</span>          refresh(client, httpClient).disableTable(name);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        System.out.println("    deleting table: " + utf8(name.array()));<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        refresh(client, httpClient).deleteTable(name);<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><a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>    //<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    // Create the demo table with two column families, entry: and unused:<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    //<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    ArrayList&lt;ColumnDescriptor&gt; columns = new ArrayList&lt;&gt;(2);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    ColumnDescriptor col;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    col = new ColumnDescriptor();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    col.name = ByteBuffer.wrap(bytes("entry:"));<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    col.timeToLive = Integer.MAX_VALUE;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    col.maxVersions = 10;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    columns.add(col);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    col = new ColumnDescriptor();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    col.name = ByteBuffer.wrap(bytes("unused:"));<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    col.timeToLive = Integer.MAX_VALUE;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    columns.add(col);<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>    System.out.println("creating table: " + utf8(t));<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    try {<a name="line.167"></a>
+<span class="sourceLineNo">124</span>  private void run() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    TTransport transport = new TSocket(host, port);<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    transport.open();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    String url = "http://" + host + ":" + port;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    THttpClient httpClient = new THttpClient(url);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    httpClient.open();<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    TProtocol protocol = new TBinaryProtocol(httpClient);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    Hbase.Client client = new Hbase.Client(protocol);<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>    byte[] t = bytes("demo_table");<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>    //<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    // Scan all tables, look for the demo table and delete it.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    //<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    System.out.println("scanning tables...");<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    for (ByteBuffer name : refresh(client, httpClient).getTableNames()) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      System.out.println("  found: " + utf8(name.array()));<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      if (utf8(name.array()).equals(utf8(t))) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        if (refresh(client, httpClient).isTableEnabled(name)) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>          System.out.println("    disabling table: " + utf8(name.array()));<a name="line.144"></a>
+<span class="sourceLineNo">145</span>          refresh(client, httpClient).disableTable(name);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        System.out.println("    deleting table: " + utf8(name.array()));<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        refresh(client, httpClient).deleteTable(name);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    }<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><a name="line.153"></a>
+<span class="sourceLineNo">154</span>    //<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    // Create the demo table with two column families, entry: and unused:<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    //<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    ArrayList&lt;ColumnDescriptor&gt; columns = new ArrayList&lt;&gt;(2);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    ColumnDescriptor col;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    col = new ColumnDescriptor();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    col.name = ByteBuffer.wrap(bytes("entry:"));<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    col.timeToLive = Integer.MAX_VALUE;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    col.maxVersions = 10;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    columns.add(col);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    col = new ColumnDescriptor();<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    col.name = ByteBuffer.wrap(bytes("unused:"));<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    col.timeToLive = Integer.MAX_VALUE;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    columns.add(col);<a name="line.167"></a>
 <span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>      refresh(client, httpClient).createTable(ByteBuffer.wrap(t), columns);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    } catch (AlreadyExists ae) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      System.out.println("WARN: " + ae.message);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>    System.out.println("column families in " + utf8(t) + ": ");<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    Map&lt;ByteBuffer, ColumnDescriptor&gt; columnMap = refresh(client, httpClient)<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        .getColumnDescriptors(ByteBuffer.wrap(t));<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    for (ColumnDescriptor col2 : columnMap.values()) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      System.out.println("  column: " + utf8(col2.name.array()) + ", maxVer: " + Integer.toString(col2.maxVersions));<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>    transport.close();<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    httpClient.close();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  private Hbase.Client refresh(Hbase.Client client, THttpClient httpClient) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    httpClient.setCustomHeader("doAs", doAsUser);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    if(secure) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      try {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        httpClient.setCustomHeader("Authorization", generateTicket());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      } catch (GSSException e) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        e.printStackTrace();<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    return client;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  private String generateTicket() throws GSSException {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    final GSSManager manager = GSSManager.getInstance();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    // Oid for kerberos principal name<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    Oid krb5PrincipalOid = new Oid("1.2.840.113554.1.2.2.1");<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    Oid KERB_V5_OID = new Oid("1.2.840.113554.1.2.2");<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    final GSSName clientName = manager.createName(principal,<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        krb5PrincipalOid);<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    final GSSCredential clientCred = manager.createCredential(clientName,<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        8 * 3600,<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        KERB_V5_OID,<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        GSSCredential.INITIATE_ONLY);<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>    final GSSName serverName = manager.createName(principal, krb5PrincipalOid);<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>    final GSSContext context = manager.createContext(serverName,<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        KERB_V5_OID,<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        clientCred,<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        GSSContext.DEFAULT_LIFETIME);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    context.requestMutualAuth(true);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    context.requestConf(false);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    context.requestInteg(true);<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>    final byte[] outToken = context.initSecContext(new byte[0], 0, 0);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    StringBuffer outputBuffer = new StringBuffer();<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    outputBuffer.append("Negotiate ");<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    outputBuffer.append(Bytes.toString(Base64.getEncoder().encode(outToken)));<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    System.out.print("Ticket is: " + outputBuffer);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    return outputBuffer.toString();<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  private void printVersions(ByteBuffer row, List&lt;TCell&gt; versions) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    StringBuilder rowStr = new StringBuilder();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    for (TCell cell : versions) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      rowStr.append(utf8(cell.value.array()));<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      rowStr.append("; ");<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    System.out.println("row: " + utf8(row.array()) + ", values: " + rowStr);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>  private void printRow(TRowResult rowResult) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    // copy values into a TreeMap to get them in sorted order<a name="line.237"></a>
+<span class="sourceLineNo">169</span>    System.out.println("creating table: " + utf8(t));<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    try {<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>      refresh(client, httpClient).createTable(ByteBuffer.wrap(t), columns);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    } catch (AlreadyExists ae) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      System.out.println("WARN: " + ae.message);<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>    System.out.println("column families in " + utf8(t) + ": ");<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    Map&lt;ByteBuffer, ColumnDescriptor&gt; columnMap = refresh(client, httpClient)<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        .getColumnDescriptors(ByteBuffer.wrap(t));<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    for (ColumnDescriptor col2 : columnMap.values()) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      System.out.println("  column: " + utf8(col2.name.array()) + ", maxVer: " + Integer.toString(col2.maxVersions));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    transport.close();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    httpClient.close();<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>  private Hbase.Client refresh(Hbase.Client client, THttpClient httpClient) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    httpClient.setCustomHeader("doAs", doAsUser);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    if(secure) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      try {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        httpClient.setCustomHeader("Authorization", generateTicket());<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      } catch (GSSException e) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        LOG.error("Kerberos authentication failed", e);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    return client;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>  private String generateTicket() throws GSSException {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    final GSSManager manager = GSSManager.getInstance();<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    // Oid for kerberos principal name<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    Oid krb5PrincipalOid = new Oid("1.2.840.113554.1.2.2.1");<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    Oid KERB_V5_OID = new Oid("1.2.840.113554.1.2.2");<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    final GSSName clientName = manager.createName(principal,<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        krb5PrincipalOid);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    final GSSCredential clientCred = manager.createCredential(clientName,<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        8 * 3600,<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        KERB_V5_OID,<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        GSSCredential.INITIATE_ONLY);<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    final GSSName serverName = manager.createName(principal, krb5PrincipalOid);<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    final GSSContext context = manager.createContext(serverName,<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        KERB_V5_OID,<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        clientCred,<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        GSSContext.DEFAULT_LIFETIME);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    context.requestMutualAuth(true);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    context.requestConf(false);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    context.requestInteg(true);<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>    final byte[] outToken = context.initSecContext(new byte[0], 0, 0);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    StringBuffer outputBuffer = new StringBuffer();<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    outputBuffer.append("Negotiate ");<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    outputBuffer.append(Bytes.toString(Base64.getEncoder().encode(outToken)));<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    System.out.print("Ticket is: " + outputBuffer);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    return outputBuffer.toString();<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>  private void printVersions(ByteBuffer row, List&lt;TCell&gt; versions) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    StringBuilder rowStr = new StringBuilder();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    for (TCell cell : versions) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      rowStr.append(utf8(cell.value.array()));<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      rowStr.append("; ");<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    System.out.println("row: " + utf8(row.array()) + ", values: " + rowStr);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>  }<a name="line.237"></a>
 <span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>    TreeMap&lt;String, TCell&gt; sorted = new TreeMap&lt;&gt;();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    for (Map.Entry&lt;ByteBuffer, TCell&gt; column : rowResult.columns.entrySet()) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      sorted.put(utf8(column.getKey().array()), column.getValue());<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>    StringBuilder rowStr = new StringBuilder();<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    for (SortedMap.Entry&lt;String, TCell&gt; entry : sorted.entrySet()) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      rowStr.append(entry.getKey());<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      rowStr.append(" =&gt; ");<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      rowStr.append(utf8(entry.getValue().value.array()));<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      rowStr.append("; ");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    System.out.println("row: " + utf8(rowResult.row.array()) + ", cols: " + rowStr);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>  static Subject getSubject() throws Exception {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    if (!secure) return new Subject();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    /*<a name="line.256"></a>
-<span class="sourceLineNo">257</span>     * To authenticate the DemoClient, kinit should be invoked ahead.<a name="line.257"></a>
-<span class="sourceLineNo">258</span>     * Here we try to get the Kerberos credential from the ticket cache.<a name="line.258"></a>
-<span class="sourceLineNo">259</span>     */<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    LoginContext context = new LoginContext("", new Subject(), null,<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        new Configuration() {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>          @Override<a name="line.262"></a>
-<span class="sourceLineNo">263</span>          public AppConfigurationEntry[] getAppConfigurationEntry(String name) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>            Map&lt;String, String&gt; options = new HashMap&lt;&gt;();<a name="line.264"></a>
-<span class="sourceLineNo">265</span>            options.put("useKeyTab", "false");<a name="line.265"></a>
-<span class="sourceLineNo">266</span>            options.put("storeKey", "false");<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            options.put("doNotPrompt", "true");<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            options.put("useTicketCache", "true");<a name="line.268"></a>
-<span class="sourceLineNo">269</span>            options.put("renewTGT", "true");<a name="line.269"></a>
-<span class="sourceLineNo">270</span>            options.put("refreshKrb5Config", "true");<a name="line.270"></a>
-<span class="sourceLineNo">271</span>            options.put("isInitiator", "true");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>            String ticketCache = System.getenv("KRB5CCNAME");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>            if (ticketCache != null) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>              options.put("ticketCache", ticketCache);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>            }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>            options.put("debug", "true");<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>            return new AppConfigurationEntry[]{<a name="line.278"></a>
-<span class="sourceLineNo">279</span>                new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule",<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,<a name="line.280"></a>
-<span class="sourceLineNo">281</span>                    options)};<a name="line.281"></a>
-<span class="sourceLineNo">282</span>          }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        });<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    context.login();<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    return context.getSubject();<a name="line.285"></a>
-<span class="sourceLineNo">286</span>  }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>}<a name="line.287"></a>
+<span class="sourceLineNo">239</span>  private void printRow(TRowResult rowResult) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    // copy values into a TreeMap to get them in sorted order<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>    TreeMap&lt;String, TCell&gt; sorted = new TreeMap&lt;&gt;();<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    for (Map.Entry&lt;ByteBuffer, TCell&gt; column : rowResult.columns.entrySet()) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      sorted.put(utf8(column.getKey().array()), column.getValue());<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    StringBuilder rowStr = new StringBuilder();<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    for (SortedMap.Entry&lt;String, TCell&gt; entry : sorted.entrySet()) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      rowStr.append(entry.getKey());<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      rowStr.append(" =&gt; ");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      rowStr.append(utf8(entry.getValue().value.array()));<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      rowStr.append("; ");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    System.out.println("row: " + utf8(rowResult.row.array()) + ", cols: " + rowStr);<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>  static Subject getSubject() throws Exception {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    if (!secure) return new Subject();<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    /*<a name="line.259"></a>
+<span class="sourceLineNo">260</span>     * To authenticate the DemoClient, kinit should be invoked ahead.<a name="line.260"></a>
+<span class="sourceLineNo">261</span>     * Here we try to get the Kerberos credential from the ticket cache.<a name="line.261"></a>
+<span class="sourceLineNo">262</span>     */<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    LoginContext context = new LoginContext("", new Subject(), null,<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        new Configuration() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>          @Override<a name="line.265"></a>
+<span class="sourceLineNo">266</span>          public AppConfigurationEntry[] getAppConfigurationEntry(String name) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>            Map&lt;String, String&gt; options = new HashMap&lt;&gt;();<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            options.put("useKeyTab", "false");<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            options.put("storeKey", "false");<a name="line.269"></a>
+<span class="sourceLineNo">270</span>            options.put("doNotPrompt", "true");<a name="line.270"></a>
+<span class="sourceLineNo">271</span>            options.put("useTicketCache", "true");<a name="line.271"></a>
+<span class="sourceLineNo">272</span>            options.put("renewTGT", "true");<a name="line.272"></a>
+<span class="sourceLineNo">273</span>            options.put("refreshKrb5Config", "true");<a name="line.273"></a>
+<span class="sourceLineNo">274</span>            options.put("isInitiator", "true");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>            String ticketCache = System.getenv("KRB5CCNAME");<a name="line.275"></a>
+<span class="sourceLineNo">276</span>            if (ticketCache != null) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              options.put("ticketCache", ticketCache);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>            }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>            options.put("debug", "true");<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>            return new AppConfigurationEntry[]{<a name="line.281"></a>
+<span class="sourceLineNo">282</span>                new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule",<a name="line.282"></a>
+<span class="sourceLineNo">283</span>                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,<a name="line.283"></a>
+<span class="sourceLineNo">284</span>                    options)};<a name="line.284"></a>
+<span class="sourceLineNo">285</span>          }<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        });<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    context.login();<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    return context.getSubject();<a name="line.288"></a>
+<span class="sourceLineNo">289</span>  }<a name="line.289"></a>
+<span class="sourceLineNo">290</span>}<a name="line.290"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html
index 3d5d8b7..8d94cde 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html
@@ -214,7 +214,7 @@
 <span class="sourceLineNo">206</span>      try {<a name="line.206"></a>
 <span class="sourceLineNo">207</span>        this.infoServer.stop();<a name="line.207"></a>
 <span class="sourceLineNo">208</span>      } catch (Exception ex) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        ex.printStackTrace();<a name="line.209"></a>
+<span class="sourceLineNo">209</span>        LOG.error("Failed to stop infoServer", ex);<a name="line.209"></a>
 <span class="sourceLineNo">210</span>      }<a name="line.210"></a>
 <span class="sourceLineNo">211</span>    }<a name="line.211"></a>
 <span class="sourceLineNo">212</span>    serverRunner.shutdown();<a name="line.212"></a>


[34/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
index 6f1fc1b..fbfe15d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
@@ -184,165 +184,166 @@
 <span class="sourceLineNo">176</span>          context.getCounter(Counters.CELLS).increment(cellCount);<a name="line.176"></a>
 <span class="sourceLineNo">177</span>        }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>      } catch (InterruptedException e) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        e.printStackTrace();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      Key, IntWritable&gt; {<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    private IntWritable result = new IntWritable();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      Context context)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    throws IOException, InterruptedException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      int sum = 0;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      for (IntWritable val : values) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        sum += val.get();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      result.set(sum);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      context.write(key, result);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * Sets up the actual job.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @param conf The current configuration.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param args The command line parameters.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return The newly created job.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @throws IOException When setting up the job fails.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    String tableName = args[0];<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    Path outputDir = new Path(args[1]);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    job.setJarByClass(CellCounter.class);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    job.setNumReduceTasks(1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    job.setMapOutputKeyClass(Text.class);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    job.setOutputKeyClass(Text.class);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    job.setOutputValueClass(IntWritable.class);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    job.setReducerClass(IntSumReducer.class);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    return job;<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>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // create scan with any properties set from TableInputFormat<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // Set Scan Versions<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      // default to all versions unless explicitly set<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    s.setCacheBlocks(false);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Filter rowFilter = getRowFilter(args);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (rowFilter!= null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      LOG.info("Setting Row Filter for counter.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      s.setFilter(rowFilter);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // Set TimeRange if defined<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    long timeRange[] = getTimeRange(args);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    if (timeRange != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      LOG.info("Setting TimeRange for counter.");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    return s;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">179</span>        LOG.error("Interrupted while writing cellCount", e);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        Thread.currentThread().interrupt();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Key, IntWritable&gt; {<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    private IntWritable result = new IntWritable();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      Context context)<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    throws IOException, InterruptedException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      int sum = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (IntWritable val : values) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        sum += val.get();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      result.set(sum);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      context.write(key, result);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Sets up the actual job.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @param conf The current configuration.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param args The command line parameters.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @return The newly created job.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @throws IOException When setting up the job fails.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    String tableName = args[0];<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    Path outputDir = new Path(args[1]);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    job.setJarByClass(CellCounter.class);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    job.setNumReduceTasks(1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    job.setMapOutputKeyClass(Text.class);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    job.setOutputKeyClass(Text.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    job.setOutputValueClass(IntWritable.class);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    job.setReducerClass(IntSumReducer.class);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    return job;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      throws IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // create scan with any properties set from TableInputFormat<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // Set Scan Versions<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      // default to all versions unless explicitly set<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    s.setCacheBlocks(false);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    Filter rowFilter = getRowFilter(args);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (rowFilter!= null) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      LOG.info("Setting Row Filter for counter.");<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      s.setFilter(rowFilter);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // Set TimeRange if defined<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    long timeRange[] = getTimeRange(args);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    if (timeRange != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      LOG.info("Setting TimeRange for counter.");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    return s;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
 <span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  private static Filter getRowFilter(String[] args) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    Filter rowFilter = null;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (filterCriteria == null) return null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    if (filterCriteria.startsWith("^")) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    return rowFilter;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    final String startTimeArgKey = "--starttime=";<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    final String endTimeArgKey = "--endtime=";<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    long startTime = 0L;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    long endTime = 0L;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return new long [] {startTime, endTime};<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public int run(String[] args) throws Exception {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (args.length &lt; 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      printUsage(args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return -1;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  private void printUsage(int parameterCount) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        + "prefix pattern.");<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * Main entry point.<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param args The command line parameters.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @throws Exception When running the job fails.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public static void main(String[] args) throws Exception {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    System.exit(errCode);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<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">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>  private static Filter getRowFilter(String[] args) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    Filter rowFilter = null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (filterCriteria == null) return null;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    if (filterCriteria.startsWith("^")) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } else {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    return rowFilter;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final String startTimeArgKey = "--starttime=";<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    final String endTimeArgKey = "--endtime=";<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    long startTime = 0L;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    long endTime = 0L;<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    return new long [] {startTime, endTime};<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>  @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  public int run(String[] args) throws Exception {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (args.length &lt; 2) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      printUsage(args.length);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>
+<span class="sourceLineNo">303</span>  private void printUsage(int parameterCount) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        + "specified to get fine grained control on what is counted.");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        + "prefix pattern.");<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * Main entry point.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param args The command line parameters.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @throws Exception When running the job fails.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void main(String[] args) throws Exception {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    System.exit(errCode);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
index 6f1fc1b..fbfe15d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
@@ -184,165 +184,166 @@
 <span class="sourceLineNo">176</span>          context.getCounter(Counters.CELLS).increment(cellCount);<a name="line.176"></a>
 <span class="sourceLineNo">177</span>        }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>      } catch (InterruptedException e) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        e.printStackTrace();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      Key, IntWritable&gt; {<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    private IntWritable result = new IntWritable();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      Context context)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    throws IOException, InterruptedException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      int sum = 0;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      for (IntWritable val : values) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        sum += val.get();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      result.set(sum);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      context.write(key, result);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * Sets up the actual job.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @param conf The current configuration.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param args The command line parameters.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return The newly created job.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @throws IOException When setting up the job fails.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    String tableName = args[0];<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    Path outputDir = new Path(args[1]);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    job.setJarByClass(CellCounter.class);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    job.setNumReduceTasks(1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    job.setMapOutputKeyClass(Text.class);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    job.setOutputKeyClass(Text.class);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    job.setOutputValueClass(IntWritable.class);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    job.setReducerClass(IntSumReducer.class);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    return job;<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>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // create scan with any properties set from TableInputFormat<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // Set Scan Versions<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      // default to all versions unless explicitly set<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    s.setCacheBlocks(false);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Filter rowFilter = getRowFilter(args);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (rowFilter!= null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      LOG.info("Setting Row Filter for counter.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      s.setFilter(rowFilter);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // Set TimeRange if defined<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    long timeRange[] = getTimeRange(args);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    if (timeRange != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      LOG.info("Setting TimeRange for counter.");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    return s;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">179</span>        LOG.error("Interrupted while writing cellCount", e);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        Thread.currentThread().interrupt();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  static class IntSumReducer&lt;Key&gt; extends Reducer&lt;Key, IntWritable,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Key, IntWritable&gt; {<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    private IntWritable result = new IntWritable();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    public void reduce(Key key, Iterable&lt;IntWritable&gt; values,<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      Context context)<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    throws IOException, InterruptedException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      int sum = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (IntWritable val : values) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        sum += val.get();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      result.set(sum);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      context.write(key, result);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Sets up the actual job.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @param conf The current configuration.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param args The command line parameters.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @return The newly created job.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @throws IOException When setting up the job fails.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    String tableName = args[0];<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    Path outputDir = new Path(args[1]);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    String reportSeparatorString = (args.length &gt; 2) ? args[2]: ":";<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    conf.set("ReportSeparator", reportSeparatorString);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    job.setJarByClass(CellCounter.class);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    Scan scan = getConfiguredScanForJob(conf, args);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        CellCounterMapper.class, ImmutableBytesWritable.class, Result.class, job);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    job.setNumReduceTasks(1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    job.setMapOutputKeyClass(Text.class);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    job.setMapOutputValueClass(IntWritable.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    job.setOutputFormatClass(TextOutputFormat.class);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    job.setOutputKeyClass(Text.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    job.setOutputValueClass(IntWritable.class);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileOutputFormat.setOutputPath(job, outputDir);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    job.setReducerClass(IntSumReducer.class);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    return job;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  private static Scan getConfiguredScanForJob(Configuration conf, String[] args)<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      throws IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // create scan with any properties set from TableInputFormat<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    Scan s = TableInputFormat.createScanFromConfiguration(conf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // Set Scan Versions<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    if (conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      // default to all versions unless explicitly set<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      s.setMaxVersions(Integer.MAX_VALUE);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    s.setCacheBlocks(false);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // Set RowFilter or Prefix Filter if applicable.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    Filter rowFilter = getRowFilter(args);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (rowFilter!= null) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      LOG.info("Setting Row Filter for counter.");<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      s.setFilter(rowFilter);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // Set TimeRange if defined<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    long timeRange[] = getTimeRange(args);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    if (timeRange != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      LOG.info("Setting TimeRange for counter.");<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      s.setTimeRange(timeRange[0], timeRange[1]);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    return s;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
 <span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  private static Filter getRowFilter(String[] args) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    Filter rowFilter = null;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (filterCriteria == null) return null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    if (filterCriteria.startsWith("^")) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    return rowFilter;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    final String startTimeArgKey = "--starttime=";<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    final String endTimeArgKey = "--endtime=";<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    long startTime = 0L;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    long endTime = 0L;<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return new long [] {startTime, endTime};<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public int run(String[] args) throws Exception {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (args.length &lt; 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      printUsage(args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return -1;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  private void printUsage(int parameterCount) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        + "prefix pattern.");<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * Main entry point.<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param args The command line parameters.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @throws Exception When running the job fails.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public static void main(String[] args) throws Exception {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    System.exit(errCode);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<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">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>  private static Filter getRowFilter(String[] args) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    Filter rowFilter = null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    String filterCriteria = (args.length &gt; 3) ? args[3]: null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (filterCriteria == null) return null;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    if (filterCriteria.startsWith("^")) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      String regexPattern = filterCriteria.substring(1, filterCriteria.length());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      rowFilter = new RowFilter(CompareOperator.EQUAL, new RegexStringComparator(regexPattern));<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } else {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      rowFilter = new PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    return rowFilter;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>  private static long[] getTimeRange(String[] args) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final String startTimeArgKey = "--starttime=";<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    final String endTimeArgKey = "--endtime=";<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    long startTime = 0L;<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    long endTime = 0L;<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    for (int i = 1; i &lt; args.length; i++) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      System.out.println("i:" + i + "arg[i]" + args[i]);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (args[i].startsWith(startTimeArgKey)) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        startTime = Long.parseLong(args[i].substring(startTimeArgKey.length()));<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (args[i].startsWith(endTimeArgKey)) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        endTime = Long.parseLong(args[i].substring(endTimeArgKey.length()));<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    if (startTime == 0 &amp;&amp; endTime == 0)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>    endTime = endTime == 0 ? HConstants.LATEST_TIMESTAMP : endTime;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    return new long [] {startTime, endTime};<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>  @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  public int run(String[] args) throws Exception {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (args.length &lt; 2) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      printUsage(args.length);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    Job job = createSubmittableJob(getConf(), args);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>
+<span class="sourceLineNo">303</span>  private void printUsage(int parameterCount) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    System.err.println("Usage: hbase cellcounter &lt;tablename&gt; &lt;outputDir&gt; [reportSeparator] "<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        + "[^[regex pattern] or [Prefix]] [--starttime=&lt;starttime&gt; --endtime=&lt;endtime&gt;]");<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    System.err.println("  Note: -D properties will be applied to the conf used.");<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    System.err.println("  Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        + "specified to get fine grained control on what is counted.");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    System.err.println("   -D" + TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    System.err.println("   -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        + "=&lt;family1&gt;,&lt;family2&gt;, ...");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    System.err.println("   -D" + TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    System.err.println("   -D" + TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    System.err.println("   -D" + TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    System.err.println("   -D" + TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    System.err.println(" &lt;reportSeparator&gt; parameter can be used to override the default report "<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        + "prefix pattern.");<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * Main entry point.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param args The command line parameters.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @throws Exception When running the job fails.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public static void main(String[] args) throws Exception {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    System.exit(errCode);<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>
 
 
 


[16/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[10/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[51/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/f3d62514
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/f3d62514
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/f3d62514

Branch: refs/heads/asf-site
Commit: f3d62514ef4cc2e44d6ca6a2b54ecc608579c680
Parents: afca75a
Author: jenkins <bu...@apache.org>
Authored: Thu Aug 16 14:47:40 2018 +0000
Committer: jenkins <bu...@apache.org>
Committed: Thu Aug 16 14:47:40 2018 +0000

----------------------------------------------------------------------
 acid-semantics.html                             |    4 +-
 apache_hbase_reference_guide.pdf                |    4 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |   22 +-
 .../apache/hadoop/hbase/filter/ParseFilter.html |   44 +-
 .../hadoop/hbase/mapred/TableMapReduceUtil.html |   36 +-
 .../hadoop/hbase/mapreduce/CellCounter.html     |    6 +-
 .../apache/hadoop/hbase/mapreduce/Import.html   |   16 +-
 .../hbase/mapreduce/TsvImporterMapper.html      |   32 +-
 .../hbase/mapreduce/TsvImporterTextMapper.html  |   16 +-
 .../hadoop/hbase/mapreduce/WALPlayer.html       |    6 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |  309 +--
 .../apache/hadoop/hbase/filter/ParseFilter.html | 1301 ++++-----
 .../hadoop/hbase/mapred/TableMapReduceUtil.html |  737 ++---
 .../hadoop/hbase/mapreduce/CellCounter.html     |  317 +--
 .../hadoop/hbase/mapreduce/CopyTable.html       |    2 +-
 .../apache/hadoop/hbase/mapreduce/Import.html   | 1095 ++++----
 .../hbase/mapreduce/TsvImporterMapper.html      |  371 +--
 .../hbase/mapreduce/TsvImporterTextMapper.html  |  194 +-
 .../hadoop/hbase/mapreduce/WALPlayer.html       |  544 ++--
 book.html                                       |    2 +-
 bulk-loads.html                                 |    4 +-
 checkstyle-aggregate.html                       |  988 ++++---
 checkstyle.rss                                  |   10 +-
 coc.html                                        |    4 +-
 dependencies.html                               |    4 +-
 dependency-convergence.html                     |    4 +-
 dependency-info.html                            |    4 +-
 dependency-management.html                      |    4 +-
 devapidocs/constant-values.html                 |    6 +-
 devapidocs/index-all.html                       |   20 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |   22 +-
 .../hadoop/hbase/backup/package-tree.html       |    4 +-
 ...ntAsyncPrefetchScanner.PrefetchRunnable.html |    6 +-
 .../client/ClientAsyncPrefetchScanner.html      |    4 +-
 .../RpcRetryingCallerWithReadReplicas.html      |    4 +-
 .../hadoop/hbase/client/package-tree.html       |   22 +-
 .../hadoop/hbase/coprocessor/package-tree.html  |    2 +-
 .../apache/hadoop/hbase/filter/ParseFilter.html |   44 +-
 .../hadoop/hbase/filter/package-tree.html       |    8 +-
 .../hadoop/hbase/io/hfile/package-tree.html     |    8 +-
 .../apache/hadoop/hbase/ipc/package-tree.html   |    4 +-
 .../hadoop/hbase/mapred/TableMapReduceUtil.html |   80 +-
 .../mapreduce/CellCounter.IntSumReducer.html    |    8 +-
 .../hadoop/hbase/mapreduce/CellCounter.html     |   14 +-
 .../hbase/mapreduce/Import.CellImporter.html    |   14 +-
 .../mapreduce/Import.CellSortImporter.html      |    2 +-
 .../hadoop/hbase/mapreduce/Import.Importer.html |   22 +-
 .../apache/hadoop/hbase/mapreduce/Import.html   |   24 +-
 .../mapreduce/SampleUploader.Uploader.html      |   10 +-
 .../hadoop/hbase/mapreduce/SampleUploader.html  |   25 +-
 .../hbase/mapreduce/TsvImporterMapper.html      |   73 +-
 .../hbase/mapreduce/TsvImporterTextMapper.html  |   45 +-
 .../mapreduce/WALPlayer.WALKeyValueMapper.html  |    2 +-
 .../hbase/mapreduce/WALPlayer.WALMapper.html    |   14 +-
 .../hadoop/hbase/mapreduce/WALPlayer.html       |   12 +-
 .../hadoop/hbase/mapreduce/package-tree.html    |    4 +-
 .../hbase/master/balancer/package-tree.html     |    2 +-
 .../hadoop/hbase/master/package-tree.html       |    4 +-
 .../hbase/master/procedure/package-tree.html    |    2 +-
 .../org/apache/hadoop/hbase/package-tree.html   |   16 +-
 .../hadoop/hbase/procedure2/Procedure.html      |   12 +-
 .../hadoop/hbase/procedure2/package-tree.html   |    4 +-
 .../store/wal/ProcedureWALPrettyPrinter.html    |   33 +-
 .../hadoop/hbase/quotas/package-tree.html       |    8 +-
 .../hadoop/hbase/regionserver/package-tree.html |   20 +-
 .../regionserver/querymatcher/package-tree.html |    2 +-
 .../hbase/regionserver/wal/package-tree.html    |    2 +-
 .../hadoop/hbase/replication/package-tree.html  |    2 +-
 .../hbase/security/access/package-tree.html     |    2 +-
 .../hadoop/hbase/security/package-tree.html     |    2 +-
 .../apache/hadoop/hbase/thrift/DemoClient.html  |   49 +-
 .../hadoop/hbase/thrift/HttpDoAsClient.html     |   51 +-
 .../apache/hadoop/hbase/util/package-tree.html  |   10 +-
 .../hadoop/hbase/wal/WALPrettyPrinter.html      |   77 +-
 ...tter.BoundedLogWriterCreationOutputSink.html |   18 +-
 .../WALSplitter.CorruptedLogFileException.html  |    6 +-
 ...WALSplitter.LogRecoveredEditsOutputSink.html |   12 +-
 .../hbase/wal/WALSplitter.MutationReplay.html   |   18 +-
 .../hbase/wal/WALSplitter.SinkWriter.html       |   16 +-
 .../hbase/wal/WALSplitter.WriterAndPath.html    |   10 +-
 .../apache/hadoop/hbase/wal/WALSplitter.html    |   11 +-
 .../hadoop/hbase/wal/class-use/WAL.Entry.html   |    3 +-
 .../hadoop/hbase/zookeeper/HQuorumPeer.html     |   56 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |  309 +--
 .../org/apache/hadoop/hbase/Version.html        |    6 +-
 .../hadoop/hbase/backup/RestoreDriver.html      |    2 +-
 ...ntAsyncPrefetchScanner.PrefetchRunnable.html |   93 +-
 .../client/ClientAsyncPrefetchScanner.html      |   93 +-
 ...eadReplicas.ReplicaRegionServerCallable.html |  119 +-
 .../RpcRetryingCallerWithReadReplicas.html      |  119 +-
 .../apache/hadoop/hbase/filter/ParseFilter.html | 1301 ++++-----
 .../hadoop/hbase/mapred/TableMapReduceUtil.html |  737 ++---
 .../CellCounter.CellCounterMapper.Counters.html |  317 +--
 .../CellCounter.CellCounterMapper.html          |  317 +--
 .../mapreduce/CellCounter.IntSumReducer.html    |  317 +--
 .../hadoop/hbase/mapreduce/CellCounter.html     |  317 +--
 .../hadoop/hbase/mapreduce/CopyTable.html       |    2 +-
 .../hbase/mapreduce/HashTable.HashMapper.html   |    2 +-
 .../hbase/mapreduce/HashTable.ResultHasher.html |    2 +-
 .../mapreduce/HashTable.TableHash.Reader.html   |    2 +-
 .../hbase/mapreduce/HashTable.TableHash.html    |    2 +-
 .../hadoop/hbase/mapreduce/HashTable.html       |    2 +-
 .../hbase/mapreduce/Import.CellImporter.html    | 1095 ++++----
 .../hbase/mapreduce/Import.CellReducer.html     | 1095 ++++----
 .../mapreduce/Import.CellSortImporter.html      | 1095 ++++----
 ...itableComparable.CellWritableComparator.html | 1095 ++++----
 .../Import.CellWritableComparable.html          | 1095 ++++----
 ...mport.CellWritableComparablePartitioner.html | 1095 ++++----
 .../hadoop/hbase/mapreduce/Import.Importer.html | 1095 ++++----
 .../apache/hadoop/hbase/mapreduce/Import.html   | 1095 ++++----
 .../mapreduce/SampleUploader.Uploader.html      |  224 +-
 .../hadoop/hbase/mapreduce/SampleUploader.html  |  224 +-
 .../SyncTable.SyncMapper.CellScanner.html       |    2 +-
 .../mapreduce/SyncTable.SyncMapper.Counter.html |    2 +-
 .../hbase/mapreduce/SyncTable.SyncMapper.html   |    2 +-
 .../hadoop/hbase/mapreduce/SyncTable.html       |    2 +-
 .../hbase/mapreduce/TsvImporterMapper.html      |  371 +--
 .../hbase/mapreduce/TsvImporterTextMapper.html  |  194 +-
 .../mapreduce/WALPlayer.WALKeyValueMapper.html  |  544 ++--
 .../hbase/mapreduce/WALPlayer.WALMapper.html    |  544 ++--
 .../hadoop/hbase/mapreduce/WALPlayer.html       |  544 ++--
 .../VerifyReplication.Verifier.Counters.html    |    2 +-
 .../replication/VerifyReplication.Verifier.html |    2 +-
 .../replication/VerifyReplication.html          |    2 +-
 .../master/HMasterCommandLine.LocalHMaster.html |    2 +-
 .../hadoop/hbase/master/HMasterCommandLine.html |    2 +-
 .../hbase/procedure2/Procedure.LockState.html   |  193 +-
 .../hadoop/hbase/procedure2/Procedure.html      |  193 +-
 .../store/wal/ProcedureWALPrettyPrinter.html    |  302 +-
 .../apache/hadoop/hbase/thrift/DemoClient.html  |  707 ++---
 .../hadoop/hbase/thrift/HttpDoAsClient.html     |  461 ++--
 .../hadoop/hbase/thrift/ThriftServer.html       |    2 +-
 .../hadoop/hbase/wal/WALPrettyPrinter.html      |  742 ++---
 ...tter.BoundedLogWriterCreationOutputSink.html |  828 +++---
 .../WALSplitter.CorruptedLogFileException.html  |  828 +++---
 .../hbase/wal/WALSplitter.EntryBuffers.html     |  828 +++---
 ...WALSplitter.LogRecoveredEditsOutputSink.html |  828 +++---
 .../hbase/wal/WALSplitter.MutationReplay.html   |  828 +++---
 .../hbase/wal/WALSplitter.OutputSink.html       |  828 +++---
 .../wal/WALSplitter.PipelineController.html     |  828 +++---
 .../wal/WALSplitter.RegionEntryBuffer.html      |  828 +++---
 .../hbase/wal/WALSplitter.SinkWriter.html       |  828 +++---
 .../hbase/wal/WALSplitter.WriterAndPath.html    |  828 +++---
 .../hbase/wal/WALSplitter.WriterThread.html     |  828 +++---
 .../apache/hadoop/hbase/wal/WALSplitter.html    |  828 +++---
 .../hadoop/hbase/zookeeper/HQuorumPeer.html     |  238 +-
 downloads.html                                  |    4 +-
 export_control.html                             |    4 +-
 index.html                                      |    4 +-
 integration.html                                |    4 +-
 issue-tracking.html                             |    4 +-
 license.html                                    |    4 +-
 mail-lists.html                                 |    4 +-
 metrics.html                                    |    4 +-
 old_news.html                                   |    4 +-
 plugin-management.html                          |    4 +-
 plugins.html                                    |    4 +-
 poweredbyhbase.html                             |    4 +-
 project-info.html                               |    4 +-
 project-reports.html                            |    4 +-
 project-summary.html                            |    4 +-
 pseudo-distributed.html                         |    4 +-
 replication.html                                |    4 +-
 resources.html                                  |    4 +-
 source-repository.html                          |    4 +-
 sponsors.html                                   |    4 +-
 supportingprojects.html                         |    4 +-
 team-list.html                                  |    4 +-
 testdevapidocs/index-all.html                   |    2 +
 .../hadoop/hbase/io/hfile/package-tree.html     |    2 +-
 .../org/apache/hadoop/hbase/package-tree.html   |   12 +-
 .../hadoop/hbase/procedure/package-tree.html    |    8 +-
 .../hadoop/hbase/procedure2/package-tree.html   |    4 +-
 .../hadoop/hbase/regionserver/package-tree.html |    2 +-
 .../apache/hadoop/hbase/test/package-tree.html  |    6 +-
 .../hbase/wal/TestWALSplit.Corruptions.html     |   16 +-
 ...ALSplit.ZombieLastLogWriterRegionServer.html |   20 +-
 .../apache/hadoop/hbase/wal/TestWALSplit.html   |  167 +-
 .../hbase/wal/TestWALSplit.Corruptions.html     | 2577 +++++++++---------
 ...ALSplit.ZombieLastLogWriterRegionServer.html | 2577 +++++++++---------
 .../apache/hadoop/hbase/wal/TestWALSplit.html   | 2577 +++++++++---------
 181 files changed, 21798 insertions(+), 21547 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index f680c8b..d1abae7 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180815" />
+    <meta name="Date-Revision-yyyymmdd" content="20180816" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) ACID Properties
@@ -601,7 +601,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-08-15</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-08-16</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 60cdac9..d666bb1 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.15, based on Prawn 2.2.2)
 /Producer (Apache HBase Team)
-/ModDate (D:20180815143043+00'00')
-/CreationDate (D:20180815144429+00'00')
+/ModDate (D:20180816142953+00'00')
+/CreationDate (D:20180816144408+00'00')
 >>
 endobj
 2 0 obj

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html b/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 8a6ff31..fe6e904 100644
--- a/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -679,7 +679,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaster</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.311">getMaster</a>(int&nbsp;serverNumber)</pre>
+<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.312">getMaster</a>(int&nbsp;serverNumber)</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>the HMaster thread</dd>
@@ -692,7 +692,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getActiveMaster</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.320">getActiveMaster</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.321">getActiveMaster</a>()</pre>
 <div class="block">Gets the current active master, if available.  If no active master, returns
  null.</div>
 <dl>
@@ -707,7 +707,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getMasters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.334">getMasters</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.335">getMasters</a>()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>Read-only list of master threads.</dd>
@@ -720,7 +720,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getLiveMasters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.343">getLiveMasters</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.344">getLiveMasters</a>()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>List of running master servers (Some servers may have been killed
@@ -735,7 +735,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnMaster</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.358">waitOnMaster</a>(int&nbsp;serverNumber)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.359">waitOnMaster</a>(int&nbsp;serverNumber)</pre>
 <div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -749,7 +749,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnMaster</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.367">waitOnMaster</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&nbsp;masterThread)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.368">waitOnMaster</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&nbsp;masterThread)</pre>
 <div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -763,7 +763,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>join</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.384">join</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.387">join</a>()</pre>
 <div class="block">Wait for Mini HBase Cluster to shut down.
  Presumes you've already called <a href="../../../../org/apache/hadoop/hbase/LocalHBaseCluster.html#shutdown--"><code>shutdown()</code></a>.</div>
 </li>
@@ -774,7 +774,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>startup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.412">startup</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.415">startup</a>()
              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Start the cluster.</div>
 <dl>
@@ -789,7 +789,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.419">shutdown</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.422">shutdown</a>()</pre>
 <div class="block">Shut down the mini HBase cluster</div>
 </li>
 </ul>
@@ -799,7 +799,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isLocal</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.427">isLocal</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.430">isLocal</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>c</code> - Configuration to check.</dd>
@@ -814,7 +814,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.437">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.440">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Test things basically work.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/filter/ParseFilter.html b/apidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
index ad9afd1..2c36d56 100644
--- a/apidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
+++ b/apidocs/org/apache/hadoop/hbase/filter/ParseFilter.html
@@ -463,7 +463,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getFilterName</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.276">getFilterName</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.277">getFilterName</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
 <div class="block">Returns the filter name given a simple filter expression
  <p></div>
 <dl>
@@ -480,7 +480,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getFilterArguments</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a>&lt;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.304">getFilterArguments</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a>&lt;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.305">getFilterArguments</a>(byte[]&nbsp;filterStringAsByteArray)</pre>
 <div class="block">Returns the arguments of the filter from the filter string
  <p></div>
 <dl>
@@ -497,7 +497,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>reduce</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.374">reduce</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.375">reduce</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
                    <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&gt;&nbsp;filterStack,
                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;operator)</pre>
 <div class="block">This function is called while parsing the filterString and an operator is parsed
@@ -516,7 +516,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>popArguments</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.392">popArguments</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.393">popArguments</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;operatorStack,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Stack.html?is-external=true" title="class or interface in java.util">Stack</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&gt;&nbsp;filterStack)</pre>
 <div class="block">Pops an argument from the operator stack and the number of arguments required by the operator
  from the filterStack and evaluates them
@@ -536,7 +536,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>hasHigherPriority</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.472">hasHigherPriority</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;a,
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.473">hasHigherPriority</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;a,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;b)</pre>
 <div class="block">Returns which operator has higher precedence
  <p>
@@ -550,7 +550,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createUnescapdArgument</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.487">createUnescapdArgument</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.488">createUnescapdArgument</a>(byte[]&nbsp;filterStringAsByteArray,
                                             int&nbsp;argumentStartIndex,
                                             int&nbsp;argumentEndIndex)</pre>
 <div class="block">Removes the single quote escaping a single quote - thus it returns an unescaped argument
@@ -571,7 +571,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForOr</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.525">checkForOr</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.526">checkForOr</a>(byte[]&nbsp;filterStringAsByteArray,
                                  int&nbsp;indexOfOr)
                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a>,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ArrayIndexOutOfBoundsException.html?is-external=true" title="class or interface in java.lang">ArrayIndexOutOfBoundsException</a></pre>
@@ -595,7 +595,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForAnd</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.551">checkForAnd</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.552">checkForAnd</a>(byte[]&nbsp;filterStringAsByteArray,
                                   int&nbsp;indexOfAnd)
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a></pre>
 <div class="block">Checks if the current index of filter string we are on is the beginning of the keyword 'AND'
@@ -617,7 +617,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForSkip</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.578">checkForSkip</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.579">checkForSkip</a>(byte[]&nbsp;filterStringAsByteArray,
                                    int&nbsp;indexOfSkip)
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a></pre>
 <div class="block">Checks if the current index of filter string we are on is the beginning of the keyword 'SKIP'
@@ -639,7 +639,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>checkForWhile</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.608">checkForWhile</a>(byte[]&nbsp;filterStringAsByteArray,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.609">checkForWhile</a>(byte[]&nbsp;filterStringAsByteArray,
                                     int&nbsp;indexOfWhile)
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharacterCodingException.html?is-external=true" title="class or interface in java.nio.charset">CharacterCodingException</a></pre>
 <div class="block">Checks if the current index of filter string we are on is the beginning of the keyword 'WHILE'
@@ -661,7 +661,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isQuoteUnescaped</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.638">isQuoteUnescaped</a>(byte[]&nbsp;array,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.639">isQuoteUnescaped</a>(byte[]&nbsp;array,
                                        int&nbsp;quoteIndex)</pre>
 <div class="block">Returns a boolean indicating whether the quote was escaped or not
  <p></div>
@@ -680,7 +680,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>removeQuotesFromByteArray</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.659">removeQuotesFromByteArray</a>(byte[]&nbsp;quotedByteArray)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.660">removeQuotesFromByteArray</a>(byte[]&nbsp;quotedByteArray)</pre>
 <div class="block">Takes a quoted byte array and converts it into an unquoted byte array
  For example: given a byte array representing 'abc', it returns a
  byte array representing abc
@@ -699,7 +699,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>convertByteArrayToInt</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.681">convertByteArrayToInt</a>(byte[]&nbsp;numberAsByteArray)</pre>
+<pre>public static&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.682">convertByteArrayToInt</a>(byte[]&nbsp;numberAsByteArray)</pre>
 <div class="block">Converts an int expressed in a byte array to an actual int
  <p>
  This doesn't use Bytes.toInt because that assumes
@@ -719,7 +719,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>convertByteArrayToLong</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.704">convertByteArrayToLong</a>(byte[]&nbsp;numberAsByteArray)</pre>
+<pre>public static&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.705">convertByteArrayToLong</a>(byte[]&nbsp;numberAsByteArray)</pre>
 <div class="block">Converts a long expressed in a byte array to an actual long
  <p>
  This doesn't use Bytes.toLong because that assumes
@@ -739,7 +739,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>convertByteArrayToBoolean</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.747">convertByteArrayToBoolean</a>(byte[]&nbsp;booleanAsByteArray)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.748">convertByteArrayToBoolean</a>(byte[]&nbsp;booleanAsByteArray)</pre>
 <div class="block">Converts a boolean expressed in a byte array to an actual boolean
 <p>
  This doesn't used Bytes.toBoolean because Bytes.toBoolean(byte [])
@@ -760,7 +760,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createCompareOperator</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase">CompareOperator</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.777">createCompareOperator</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase">CompareOperator</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.778">createCompareOperator</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
 <div class="block">Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -777,7 +777,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <li class="blockList">
 <h4>createCompareOp</h4>
 <pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter">CompareFilter.CompareOp</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.804">createCompareOp</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
+public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter">CompareFilter.CompareOp</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.805">createCompareOp</a>(byte[]&nbsp;compareOpAsByteArray)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Since 2.0
  <p></span></div>
 <div class="block">Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator</div>
@@ -795,7 +795,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>createComparator</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/ByteArrayComparable.html" title="class in org.apache.hadoop.hbase.filter">ByteArrayComparable</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.828">createComparator</a>(byte[]&nbsp;comparator)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/ByteArrayComparable.html" title="class in org.apache.hadoop.hbase.filter">ByteArrayComparable</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.829">createComparator</a>(byte[]&nbsp;comparator)</pre>
 <div class="block">Parses a comparator of the form comparatorType:comparatorValue form and returns a comparator
  <p></div>
 <dl>
@@ -812,7 +812,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>parseComparator</h4>
-<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.854">parseComparator</a>(byte[]&nbsp;comparator)</pre>
+<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.855">parseComparator</a>(byte[]&nbsp;comparator)</pre>
 <div class="block">Splits a column in comparatorType:comparatorValue form into separate byte arrays
  <p></div>
 <dl>
@@ -829,7 +829,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>getSupportedFilters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.875">getSupportedFilters</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.876">getSupportedFilters</a>()</pre>
 <div class="block">Return a Set of filters supported by the Filter Language</div>
 </li>
 </ul>
@@ -839,7 +839,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockList">
 <li class="blockList">
 <h4>getAllFilters</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.883">getAllFilters</a>()</pre>
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.884">getAllFilters</a>()</pre>
 <div class="block">Returns all known filters</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -853,7 +853,7 @@ public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Compar
 <ul class="blockListLast">
 <li class="blockList">
 <h4>registerFilter</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.894">registerFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/filter/ParseFilter.html#line.895">registerFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;filterClass)</pre>
 <div class="block">Register a new filter with the parser.  If the filter is already registered,
  an IllegalArgumentException will be thrown.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html b/apidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
index 630d740..f7c17b8 100644
--- a/apidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
+++ b/apidocs/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.53">TableMapReduceUtil</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.55">TableMapReduceUtil</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Utility for <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred"><code>TableMap</code></a> and <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred"><code>TableReduce</code></a></div>
 </li>
@@ -325,7 +325,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TableMapReduceUtil</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.53">TableMapReduceUtil</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.55">TableMapReduceUtil</a>()</pre>
 </li>
 </ul>
 </li>
@@ -342,7 +342,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.66">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.69">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -367,7 +367,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.74">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.77">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -382,7 +382,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.95">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.98">initTableMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -411,7 +411,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initMultiTableSnapshotMapperJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.138">initMultiTableSnapshotMapperJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&gt;&nbsp;snapshotScans,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.141">initMultiTableSnapshotMapperJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&gt;&nbsp;snapshotScans,
                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputValueClass,
@@ -443,7 +443,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableSnapshotMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.177">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.180">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -481,7 +481,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableSnapshotMapJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.210">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.213">initTableSnapshotMapJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;snapshotName,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;columns,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableMap.html" title="interface in org.apache.hadoop.hbase.mapred">TableMap</a>&gt;&nbsp;mapper,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;outputKeyClass,
@@ -523,7 +523,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableReduceJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.235">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.238">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred">TableReduce</a>&gt;&nbsp;reducer,
                                       org.apache.hadoop.mapred.JobConf&nbsp;job)
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -545,7 +545,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableReduceJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.252">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.255">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred">TableReduce</a>&gt;&nbsp;reducer,
                                       org.apache.hadoop.mapred.JobConf&nbsp;job,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;partitioner)
@@ -570,7 +570,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initTableReduceJob</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.271">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.274">initTableReduceJob</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in org.apache.hadoop.hbase.mapred">TableReduce</a>&gt;&nbsp;reducer,
                                       org.apache.hadoop.mapred.JobConf&nbsp;job,
                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&nbsp;partitioner,
@@ -598,7 +598,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>initCredentials</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.297">initCredentials</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.300">initCredentials</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -612,7 +612,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>limitNumReduceTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.330">limitNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.333">limitNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                        org.apache.hadoop.mapred.JobConf&nbsp;job)
                                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Ensures that the given number of reduce tasks for the given job
@@ -632,7 +632,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>limitNumMapTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.347">limitNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.350">limitNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                     org.apache.hadoop.mapred.JobConf&nbsp;job)
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Ensures that the given number of map tasks for the given job
@@ -652,7 +652,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setNumReduceTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.363">setNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.366">setNumReduceTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                      org.apache.hadoop.mapred.JobConf&nbsp;job)
                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets the number of reduce tasks for the given job configuration to the
@@ -672,7 +672,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setNumMapTasks</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.377">setNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.380">setNumMapTasks</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;table,
                                   org.apache.hadoop.mapred.JobConf&nbsp;job)
                            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets the number of map tasks for the given job configuration to the
@@ -692,7 +692,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setScannerCaching</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.392">setScannerCaching</a>(org.apache.hadoop.mapred.JobConf&nbsp;job,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.395">setScannerCaching</a>(org.apache.hadoop.mapred.JobConf&nbsp;job,
                                      int&nbsp;batchSize)</pre>
 <div class="block">Sets the number of rows to return and cache with each scanner iteration.
  Higher caching values will enable faster mapreduce jobs at the expense of
@@ -711,7 +711,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>addDependencyJars</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.399">addDependencyJars</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.html#line.402">addDependencyJars</a>(org.apache.hadoop.mapred.JobConf&nbsp;job)
                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html b/apidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
index 354e2d3..47cd1f7 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/CellCounter.html
@@ -249,7 +249,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSubmittableJob</h4>
-<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.208">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.209">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets up the actual job.</div>
@@ -270,7 +270,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.293">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.294">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -286,7 +286,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.332">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html#line.333">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/org/apache/hadoop/hbase/mapreduce/Import.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/Import.html b/apidocs/org/apache/hadoop/hbase/mapreduce/Import.html
index 54c322a..bcf2f2a 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/Import.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/Import.html
@@ -414,7 +414,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>instantiateFilter</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.442">instantiateFilter</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.445">instantiateFilter</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">Create a <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter"><code>Filter</code></a> to apply to all incoming keys (<code>KeyValues</code>) to
  optionally not include in the job output</div>
 <dl>
@@ -433,7 +433,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>filterKv</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.489">filterKv</a>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;filter,
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.492">filterKv</a>(<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;filter,
                             <a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;c)
                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Attempt to filter out the keyvalue</div>
@@ -454,7 +454,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>configureCfRenaming</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.564">configureCfRenaming</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.567">configureCfRenaming</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;renameMap)</pre>
 <div class="block"><p>Sets a configuration property with key <a href="../../../../../org/apache/hadoop/hbase/mapreduce/Import.html#CF_RENAME_PROP"><code>CF_RENAME_PROP</code></a> in conf that tells
  the mapper how to rename column families.
@@ -477,7 +477,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>addFilterAndArguments</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.591">addFilterAndArguments</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.594">addFilterAndArguments</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class in org.apache.hadoop.hbase.filter">Filter</a>&gt;&nbsp;clazz,
                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;filterArgs)
                                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -498,7 +498,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createSubmittableJob</h4>
-<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.604">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;org.apache.hadoop.mapreduce.Job&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.607">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                                                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Sets up the actual job.</div>
@@ -519,7 +519,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>flushRegionsIfNecessary</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.718">flushRegionsIfNecessary</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.721">flushRegionsIfNecessary</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                                     throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <div class="block">If the durability is set to <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html#SKIP_WAL"><code>Durability.SKIP_WAL</code></a> and the data is imported to hbase, we
@@ -539,7 +539,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.744">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.747">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -555,7 +555,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.777">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/Import.html#line.780">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl>


[07/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
index 63e4b46..514f830 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
@@ -468,15 +468,15 @@
 <span class="sourceLineNo">460</span>   * creating it if necessary.<a name="line.460"></a>
 <span class="sourceLineNo">461</span>   * @param logEntry<a name="line.461"></a>
 <span class="sourceLineNo">462</span>   * @param fileNameBeingSplit the file being split currently. Used to generate tmp file name.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * @param conf<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @return Path to file into which to dump split log edits.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @throws IOException<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @SuppressWarnings("deprecation")<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @VisibleForTesting<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      Configuration conf)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">463</span>   * @param tmpDirName of the directory used to sideline old recovered edits file<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param conf<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @return Path to file into which to dump split log edits.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * @throws IOException<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>  @SuppressWarnings("deprecation")<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  @VisibleForTesting<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  static Path getRegionSplitEditsPath(final Entry logEntry, String fileNameBeingSplit,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      String tmpDirName, Configuration conf) throws IOException {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(conf);<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.473"></a>
 <span class="sourceLineNo">474</span>    Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());<a name="line.474"></a>
@@ -491,7 +491,7 @@
 <span class="sourceLineNo">483</span>      return null;<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    }<a name="line.484"></a>
 <span class="sourceLineNo">485</span>    if (fs.exists(dir) &amp;&amp; fs.isFile(dir)) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      Path tmp = new Path("/tmp");<a name="line.486"></a>
+<span class="sourceLineNo">486</span>      Path tmp = new Path(tmpDirName);<a name="line.486"></a>
 <span class="sourceLineNo">487</span>      if (!fs.exists(tmp)) {<a name="line.487"></a>
 <span class="sourceLineNo">488</span>        fs.mkdirs(tmp);<a name="line.488"></a>
 <span class="sourceLineNo">489</span>      }<a name="line.489"></a>
@@ -1520,411 +1520,413 @@
 <span class="sourceLineNo">1512</span>     * @return a path with a write for that path. caller should close.<a name="line.1512"></a>
 <span class="sourceLineNo">1513</span>     */<a name="line.1513"></a>
 <span class="sourceLineNo">1514</span>    WriterAndPath createWAP(byte[] region, Entry entry) throws IOException {<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span>          fileBeingSplit.getPath().getName(), conf);<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span>      if (regionedits == null) {<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span>        return null;<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>      }<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>      if (rootFs.exists(regionedits)) {<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1525"></a>
-<span class="sourceLineNo">1526</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>        }<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>      }<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span>      Writer w = createWriter(regionedits);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span><a name="line.1533"></a>
-<span class="sourceLineNo">1534</span>    void filterCellByStore(Entry logEntry) {<a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span>        return;<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span>      }<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span>      // Create the array list for the cells that aren't filtered.<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>      // We make the assumption that most cells will be kept.<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>          keptCells.add(cell);<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>        } else {<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>          // or the master was crashed before and we can not get the information.<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>            keptCells.add(cell);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>          }<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>        }<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>      }<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span><a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      // Anything in the keptCells array list is still live.<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      // So rather than removing the cells from the array list<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>    }<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span><a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    @Override<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>      appendBuffer(buffer, true);<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>    }<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span><a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>      if (entries.isEmpty()) {<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>        return null;<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      }<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span><a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      WriterAndPath wap = null;<a name="line.1575"></a>
+<span class="sourceLineNo">1515</span>      String tmpDirName = conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>        HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>      Path regionedits = getRegionSplitEditsPath(entry,<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>          fileBeingSplit.getPath().getName(), tmpDirName, conf);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span>      if (regionedits == null) {<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>        return null;<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>      }<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span>      FileSystem rootFs = FileSystem.get(conf);<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span>      if (rootFs.exists(regionedits)) {<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span>        LOG.warn("Found old edits file. It could be the "<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span>            + "result of a previous failed split attempt. Deleting " + regionedits + ", length="<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>            + rootFs.getFileStatus(regionedits).getLen());<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        if (!rootFs.delete(regionedits, false)) {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>          LOG.warn("Failed delete of old {}", regionedits);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span>        }<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>      }<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span>      Writer w = createWriter(regionedits);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span>      LOG.debug("Creating writer path={}", regionedits);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span>      return new WriterAndPath(regionedits, w, entry.getKey().getSequenceId());<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>    void filterCellByStore(Entry logEntry) {<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>      Map&lt;byte[], Long&gt; maxSeqIdInStores =<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span>          regionMaxSeqIdInStores.get(Bytes.toString(logEntry.getKey().getEncodedRegionName()));<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>      if (MapUtils.isEmpty(maxSeqIdInStores)) {<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span>        return;<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>      }<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span>      // Create the array list for the cells that aren't filtered.<a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>      // We make the assumption that most cells will be kept.<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      ArrayList&lt;Cell&gt; keptCells = new ArrayList&lt;&gt;(logEntry.getEdit().getCells().size());<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>      for (Cell cell : logEntry.getEdit().getCells()) {<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>        if (CellUtil.matchingFamily(cell, WALEdit.METAFAMILY)) {<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>          keptCells.add(cell);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>        } else {<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>          byte[] family = CellUtil.cloneFamily(cell);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>          Long maxSeqId = maxSeqIdInStores.get(family);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>          // Do not skip cell even if maxSeqId is null. Maybe we are in a rolling upgrade,<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>          // or the master was crashed before and we can not get the information.<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>          if (maxSeqId == null || maxSeqId.longValue() &lt; logEntry.getKey().getSequenceId()) {<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>            keptCells.add(cell);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>          }<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>        }<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span><a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>      // Anything in the keptCells array list is still live.<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      // So rather than removing the cells from the array list<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>      // which would be an O(n^2) operation, we just replace the list<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      logEntry.getEdit().setCells(keptCells);<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span><a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    @Override<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      appendBuffer(buffer, true);<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>    }<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span><a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>    WriterAndPath appendBuffer(RegionEntryBuffer buffer, boolean reusable) throws IOException{<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>      List&lt;Entry&gt; entries = buffer.entryBuffer;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>      if (entries.isEmpty()) {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>        LOG.warn("got an empty buffer, skipping");<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>        return null;<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>      }<a name="line.1575"></a>
 <span class="sourceLineNo">1576</span><a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>      long startTime = System.nanoTime();<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      try {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>        int editsCount = 0;<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span><a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>        for (Entry logEntry : entries) {<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>          if (wap == null) {<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>            if (wap == null) {<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>              // WAL lost edit issues.<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>              return null;<a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>            }<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>          }<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>          filterCellByStore(logEntry);<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>            wap.w.append(logEntry);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>            editsCount++;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>          } else {<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>            wap.incrementSkippedEdits(1);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>          }<a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>        }<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span>        // Pass along summary statistics<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>        wap.incrementEdits(editsCount);<a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>      } catch (IOException e) {<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>          e = e instanceof RemoteException ?<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>        throw e;<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>      }<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>      return wap;<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    }<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span><a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    @Override<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>      for (Cell cell : cells) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>          return true;<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>        }<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>      }<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return false;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>    }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>     */<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    @Override<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>      }<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      return ret;<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    }<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span><a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    @Override<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    public int getNumberOfRecoveredRegions() {<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>      return writers.size();<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>    }<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>  }<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span><a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>  /**<a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>   *<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>   */<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span><a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1646"></a>
+<span class="sourceLineNo">1577</span>      WriterAndPath wap = null;<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span><a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>      long startTime = System.nanoTime();<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>      try {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>        int editsCount = 0;<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>        for (Entry logEntry : entries) {<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>          if (wap == null) {<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>            wap = getWriterAndPath(logEntry, reusable);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>            if (wap == null) {<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>              // This log spews the full edit. Can be massive in the log. Enable only debugging<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>              // WAL lost edit issues.<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>              LOG.trace("getWriterAndPath decided we don't need to write edits for {}", logEntry);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>              return null;<a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>            }<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>          }<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>          filterCellByStore(logEntry);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>          if (!logEntry.getEdit().isEmpty()) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>            wap.w.append(logEntry);<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>            this.updateRegionMaximumEditLogSeqNum(logEntry);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>            editsCount++;<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>          } else {<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>            wap.incrementSkippedEdits(1);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>          }<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>        }<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>        // Pass along summary statistics<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>        wap.incrementEdits(editsCount);<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>        wap.incrementNanoTime(System.nanoTime() - startTime);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>      } catch (IOException e) {<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>          e = e instanceof RemoteException ?<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>                  ((RemoteException)e).unwrapRemoteException() : e;<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        LOG.error(HBaseMarkers.FATAL, "Got while writing log entry to log", e);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>        throw e;<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return wap;<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span><a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>    @Override<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    public boolean keepRegionEvent(Entry entry) {<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>      ArrayList&lt;Cell&gt; cells = entry.getEdit().getCells();<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>      for (Cell cell : cells) {<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>        if (WALEdit.isCompactionMarker(cell)) {<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>          return true;<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>        }<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      }<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>      return false;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>    }<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span><a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>    /**<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>     */<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    @Override<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>      TreeMap&lt;byte[], Long&gt; ret = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>      for (Map.Entry&lt;String, SinkWriter&gt; entry : writers.entrySet()) {<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>        ret.put(Bytes.toBytes(entry.getKey()), entry.getValue().editsWritten);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return ret;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>    }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    @Override<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    public int getNumberOfRecoveredRegions() {<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>      return writers.size();<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    }<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>  }<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span><a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>  /**<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>   *<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>   */<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>  class BoundedLogWriterCreationOutputSink extends LogRecoveredEditsOutputSink {<a name="line.1646"></a>
 <span class="sourceLineNo">1647</span><a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>      super(controller, entryBuffers, numWriters);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>    }<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span><a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    @Override<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>      boolean isSuccessful;<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>      List&lt;Path&gt; result;<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>      try {<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>        isSuccessful = finishWriting(false);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>      } finally {<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>        result = close();<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>      }<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>      if (isSuccessful) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>        splits = result;<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      }<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>      return splits;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    }<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span><a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>    @Override<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>        throws InterruptedException, ExecutionException {<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1673"></a>
-<span class="sourceLineNo">1674</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>          @Override<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>          public Void call() throws Exception {<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            paths.add(dst);<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>            return null;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>          }<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>        });<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>      }<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>      boolean progress_failed = false;<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        future.get();<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>          progress_failed = true;<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>        }<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>      }<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span><a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>      return progress_failed;<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    }<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span><a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>    /**<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>     */<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    @Override<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>      }<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>      return regionRecoverStatMapResult;<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    }<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span><a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    /**<a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>     * @return the number of recovered regions<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>     */<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    @Override<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    public int getNumberOfRecoveredRegions() {<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>      return regionRecoverStatMap.size();<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    }<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span><a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>    /**<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>     * @param buffer contain all entries of a certain region<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>     * @throws IOException when closeWriter failed<a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>     */<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    @Override<a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      writeThenClose(buffer);<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>    }<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span><a name="line.1727"></a>
-<span class="sourceLineNo">1728</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      if(wap != null) {<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>        if (value != null) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        }<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>      }<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span><a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>      Path dst = null;<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>      if(wap != null){<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>      }<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>      if (!thrown.isEmpty()) {<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>      }<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>      return dst;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>    }<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>  }<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span><a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>  /**<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>   */<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>  public abstract static class SinkWriter {<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>    /* Count of edits written to this path */<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>    long editsWritten = 0;<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>    /* Count of edits skipped to this path */<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    long editsSkipped = 0;<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    /* Number of nanos spent writing to this log */<a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    long nanosSpent = 0;<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span><a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    void incrementEdits(int edits) {<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>      editsWritten += edits;<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>    }<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span><a name="line.1765"></a>
-<span class="sourceLineNo">1766</span>    void incrementSkippedEdits(int skipped) {<a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      editsSkipped += skipped;<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    }<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span><a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    void incrementNanoTime(long nanos) {<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      nanosSpent += nanos;<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>    }<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>  }<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span><a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>  /**<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>   * data written to this output.<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>   */<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    final Path p;<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>    final Writer w;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>    final long minLogSeqNum;<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span><a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>      this.p = p;<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>      this.w = w;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    }<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>  }<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span><a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>  static class CorruptedLogFileException extends Exception {<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>    private static final long serialVersionUID = 1L;<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span><a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    CorruptedLogFileException(String s) {<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>      super(s);<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    }<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>  }<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span><a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>      this.type = type;<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>      this.mutation = mutation;<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>        // using ASYNC_WAL for relay<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      }<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>      this.nonceGroup = nonceGroup;<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>      this.nonce = nonce;<a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>    }<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    public final MutationType type;<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    public final Mutation mutation;<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    public final long nonceGroup;<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    public final long nonce;<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    @Override<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    public int compareTo(final MutationReplay d) {<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      return this.mutation.compareTo(d.mutation);<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    }<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span><a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    @Override<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    public boolean equals(Object obj) {<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span>        return false;<a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>      } else {<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>      }<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    }<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span><a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    @Override<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    public int hashCode() {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      return this.mutation.hashCode();<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>    }<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>  }<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span><a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>  /**<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>   * @param entry<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>   * @param cells<a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>   *          extracted from the passed in WALEntry.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>   * @throws IOException<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   */<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    if (entry == null) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      // return an empty array<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>      return Collections.emptyList();<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    }<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span><a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    int count = entry.getAssociatedCellCount();<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    Cell previousCell = null;<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    Mutation m = null;<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    WALKeyImpl key = null;<a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    WALEdit val = null;<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    if (logEntry != null) {<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      val = new WALEdit();<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    }<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span><a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      // Throw index out of bounds if our cell count is off<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      if (!cells.advance()) {<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      }<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>      Cell cell = cells.current();<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>      if (val != null) val.add(cell);<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span><a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      boolean isNewRowOrType =<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>      if (isNewRowOrType) {<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>        // Create new mutation<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>        if (CellUtil.isDelete(cell)) {<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>          // Deletes don't have nonces.<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>          mutations.add(new MutationReplay(<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>        } else {<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>        }<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>      }<a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>      if (CellUtil.isDelete(cell)) {<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>        ((Delete) m).add(cell);<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>      } else {<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>        ((Put) m).add(cell);<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>      }<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>      m.setDurability(durability);<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      previousCell = cell;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span><a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    // reconstruct WALKey<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    if (logEntry != null) {<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>          entry.getKey();<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      }<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      logEntry.setFirst(key);<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>      logEntry.setSecond(val);<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>    }<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span><a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>    return mutations;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>  }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>}<a name="line.1919"></a>
+<span class="sourceLineNo">1648</span>    private ConcurrentHashMap&lt;String, Long&gt; regionRecoverStatMap = new ConcurrentHashMap&lt;&gt;();<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span><a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    public BoundedLogWriterCreationOutputSink(PipelineController controller,<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>        EntryBuffers entryBuffers, int numWriters) {<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>      super(controller, entryBuffers, numWriters);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>    }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span><a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    @Override<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    public List&lt;Path&gt; finishWritingAndClose() throws IOException {<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>      boolean isSuccessful;<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>      List&lt;Path&gt; result;<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>      try {<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        isSuccessful = finishWriting(false);<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>      } finally {<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>        result = close();<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>      }<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>      if (isSuccessful) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>        splits = result;<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>      }<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      return splits;<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>    }<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span><a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>    @Override<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>    boolean executeCloseTask(CompletionService&lt;Void&gt; completionService,<a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>        List&lt;IOException&gt; thrown, List&lt;Path&gt; paths)<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>        throws InterruptedException, ExecutionException {<a name="line.1673"></a>
+<span class="sourceLineNo">1674</span>      for (final Map.Entry&lt;byte[], RegionEntryBuffer&gt; buffer : entryBuffers.buffers.entrySet()) {<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>        LOG.info("Submitting writeThenClose of {}",<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>            Arrays.toString(buffer.getValue().encodedRegionName));<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span>        completionService.submit(new Callable&lt;Void&gt;() {<a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>          @Override<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>          public Void call() throws Exception {<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>            Path dst = writeThenClose(buffer.getValue());<a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>            paths.add(dst);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>            return null;<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>          }<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        });<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>      }<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>      boolean progress_failed = false;<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      for (int i = 0, n = entryBuffers.buffers.size(); i &lt; n; i++) {<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>        Future&lt;Void&gt; future = completionService.take();<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>        future.get();<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>        if (!progress_failed &amp;&amp; reporter != null &amp;&amp; !reporter.progress()) {<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>          progress_failed = true;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>        }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>      }<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span><a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>      return progress_failed;<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    }<a name="line.1696"></a>
+<span class="sourceLineNo">1697</span><a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    /**<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>     * since the splitting process may create multiple output files, we need a map<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>     * regionRecoverStatMap to track the output count of each region.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>     * @return a map from encoded region ID to the number of edits written out for that region.<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>     */<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    @Override<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    public Map&lt;byte[], Long&gt; getOutputCounts() {<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>      Map&lt;byte[], Long&gt; regionRecoverStatMapResult = new HashMap&lt;&gt;();<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>      for(Map.Entry&lt;String, Long&gt; entry: regionRecoverStatMap.entrySet()){<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>        regionRecoverStatMapResult.put(Bytes.toBytes(entry.getKey()), entry.getValue());<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>      }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span>      return regionRecoverStatMapResult;<a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    }<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span><a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    /**<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>     * @return the number of recovered regions<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>     */<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    @Override<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    public int getNumberOfRecoveredRegions() {<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>      return regionRecoverStatMap.size();<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    }<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span><a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    /**<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>     * Append the buffer to a new recovered edits file, then close it after all done<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>     * @param buffer contain all entries of a certain region<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>     * @throws IOException when closeWriter failed<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>     */<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    @Override<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span>    public void append(RegionEntryBuffer buffer) throws IOException {<a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>      writeThenClose(buffer);<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    }<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span><a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    private Path writeThenClose(RegionEntryBuffer buffer) throws IOException {<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>      WriterAndPath wap = appendBuffer(buffer, false);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>      if(wap != null) {<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>        String encodedRegionName = Bytes.toString(buffer.encodedRegionName);<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        Long value = regionRecoverStatMap.putIfAbsent(encodedRegionName, wap.editsWritten);<a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        if (value != null) {<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>          Long newValue = regionRecoverStatMap.get(encodedRegionName) + wap.editsWritten;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span>          regionRecoverStatMap.put(encodedRegionName, newValue);<a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>        }<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span>      }<a name="line.1739"></a>
+<span class="sourceLineNo">1740</span><a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      Path dst = null;<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      List&lt;IOException&gt; thrown = new ArrayList&lt;&gt;();<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      if(wap != null){<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        dst = closeWriter(Bytes.toString(buffer.encodedRegionName), wap, thrown);<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span>      }<a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      if (!thrown.isEmpty()) {<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>        throw MultipleIOException.createIOException(thrown);<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>      }<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>      return dst;<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    }<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>  }<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span><a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>  /**<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>   * Class wraps the actual writer which writes data out and related statistics<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>   */<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>  public abstract static class SinkWriter {<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    /* Count of edits written to this path */<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    long editsWritten = 0;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    /* Count of edits skipped to this path */<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    long editsSkipped = 0;<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>    /* Number of nanos spent writing to this log */<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>    long nanosSpent = 0;<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span><a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>    void incrementEdits(int edits) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>      editsWritten += edits;<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>    }<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span><a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    void incrementSkippedEdits(int skipped) {<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>      editsSkipped += skipped;<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    }<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span><a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>    void incrementNanoTime(long nanos) {<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      nanosSpent += nanos;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>    }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span>  }<a name="line.1775"></a>
+<span class="sourceLineNo">1776</span><a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>  /**<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>   * Private data structure that wraps a Writer and its Path, also collecting statistics about the<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>   * data written to this output.<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>   */<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>  private final static class WriterAndPath extends SinkWriter {<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    final Path p;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    final Writer w;<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    final long minLogSeqNum;<a name="line.1784"></a>
+<span class="sourceLineNo">1785</span><a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    WriterAndPath(final Path p, final Writer w, final long minLogSeqNum) {<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>      this.p = p;<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>      this.w = w;<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>      this.minLogSeqNum = minLogSeqNum;<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>    }<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>  }<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>  static class CorruptedLogFileException extends Exception {<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    private static final long serialVersionUID = 1L;<a name="line.1794"></a>
+<span class="sourceLineNo">1795</span><a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    CorruptedLogFileException(String s) {<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      super(s);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    }<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>  }<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>  /** A struct used by getMutationsFromWALEntry */<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>  public static class MutationReplay implements Comparable&lt;MutationReplay&gt; {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    public MutationReplay(MutationType type, Mutation mutation, long nonceGroup, long nonce) {<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>      this.type = type;<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>      this.mutation = mutation;<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>      if(this.mutation.getDurability() != Durability.SKIP_WAL) {<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>        // using ASYNC_WAL for relay<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>        this.mutation.setDurability(Durability.ASYNC_WAL);<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>      }<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>      this.nonceGroup = nonceGroup;<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>      this.nonce = nonce;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>    }<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    public final MutationType type;<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    public final Mutation mutation;<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    public final long nonceGroup;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    public final long nonce;<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span><a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>    @Override<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>    public int compareTo(final MutationReplay d) {<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>      return this.mutation.compareTo(d.mutation);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>    }<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span><a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    @Override<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    public boolean equals(Object obj) {<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>      if(!(obj instanceof MutationReplay)) {<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>        return false;<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>      } else {<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        return this.compareTo((MutationReplay)obj) == 0;<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>      }<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    }<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span><a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    @Override<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>    public int hashCode() {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span>      return this.mutation.hashCode();<a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>    }<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span>  }<a name="line.1837"></a>
+<span class="sourceLineNo">1838</span><a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>  /**<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>   * This function is used to construct mutations from a WALEntry. It also<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>   * reconstructs WALKey &amp;amp; WALEdit from the passed in WALEntry<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>   * @param entry<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>   * @param cells<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span>   * @param logEntry pair of WALKey and WALEdit instance stores WALKey and WALEdit instances<a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>   *          extracted from the passed in WALEntry.<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>   * @return list of Pair&amp;lt;MutationType, Mutation&amp;gt; to be replayed<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>   * @throws IOException<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>   */<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>  public static List&lt;MutationReplay&gt; getMutationsFromWALEntry(WALEntry entry, CellScanner cells,<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>      Pair&lt;WALKey, WALEdit&gt; logEntry, Durability durability) throws IOException {<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>    if (entry == null) {<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>      // return an empty array<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>      return Collections.emptyList();<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>    }<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span><a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>    long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>      entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>    int count = entry.getAssociatedCellCount();<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>    List&lt;MutationReplay&gt; mutations = new ArrayList&lt;&gt;();<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>    Cell previousCell = null;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>    Mutation m = null;<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>    WALKeyImpl key = null;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>    WALEdit val = null;<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>    if (logEntry != null) {<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>      val = new WALEdit();<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>    }<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span><a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>    for (int i = 0; i &lt; count; i++) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>      // Throw index out of bounds if our cell count is off<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>      if (!cells.advance()) {<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>        throw new ArrayIndexOutOfBoundsException("Expected=" + count + ", index=" + i);<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>      }<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>      Cell cell = cells.current();<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>      if (val != null) val.add(cell);<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span><a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>      boolean isNewRowOrType =<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>          previousCell == null || previousCell.getTypeByte() != cell.getTypeByte()<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>              || !CellUtil.matchingRows(previousCell, cell);<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>      if (isNewRowOrType) {<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span>        // Create new mutation<a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>        if (CellUtil.isDelete(cell)) {<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>          m = new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>          // Deletes don't have nonces.<a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>          mutations.add(new MutationReplay(<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>              MutationType.DELETE, m, HConstants.NO_NONCE, HConstants.NO_NONCE));<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>        } else {<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>          m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>          // Puts might come from increment or append, thus we need nonces.<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>          long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>              ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>          long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>          mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>        }<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>      if (CellUtil.isDelete(cell)) {<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span>        ((Delete) m).add(cell);<a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>      } else {<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>        ((Put) m).add(cell);<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      }<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      m.setDurability(durability);<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>      previousCell = cell;<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    }<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span><a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>    // reconstruct WALKey<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    if (logEntry != null) {<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          entry.getKey();<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>      List&lt;UUID&gt; clusterIds = new ArrayList&lt;&gt;(walKeyProto.getClusterIdsCount());<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>      for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>        clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>      }<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>      key = new WALKeyImpl(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>              walKeyProto.getTableName().toByteArray()), replaySeqId, walKeyProto.getWriteTime(),<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>              clusterIds, walKeyProto.getNonceGroup(), walKeyProto.getNonce(), null);<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>      logEntry.setFirst(key);<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      logEntry.setSecond(val);<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>    }<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span><a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    return mutations;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 


[23/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

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

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
index 9501e97..a10ddfe 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
@@ -131,277 +131,279 @@
 <span class="sourceLineNo">123</span>          }<a name="line.123"></a>
 <span class="sourceLineNo">124</span>        }<a name="line.124"></a>
 <span class="sourceLineNo">125</span>      } catch (InterruptedException e) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        e.printStackTrace();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void setup(Context context) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      Configuration conf = context.getConfiguration();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      for (String table : tables) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        tableSet.add(table);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   */<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  protected static class WALMapper<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>          TableName targetTable =<a name="line.152"></a>
-<span class="sourceLineNo">153</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.154"></a>
-<span class="sourceLineNo">155</span>          Put put = null;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          Delete del = null;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          Cell lastCell = null;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          for (Cell cell : value.getCells()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>            // filtering WAL meta entries<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>              continue;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>            }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>            // Allow a subclass filter out this cell.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>            if (filter(context, cell)) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.166"></a>
-<span class="sourceLineNo">167</span>              // multiple rows (HBASE-5229).<a name="line.167"></a>
-<span class="sourceLineNo">168</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.168"></a>
-<span class="sourceLineNo">169</span>              // operation before writing to the context.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>                // row or type changed, write out aggregate KVs.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                if (put != null) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                  context.write(tableOut, put);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                if (del != null) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                  context.write(tableOut, del);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                if (CellUtil.isDelete(cell)) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                } else {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.182"></a>
-<span class="sourceLineNo">183</span>                }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>              }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>              if (CellUtil.isDelete(cell)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>                del.add(cell);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>              } else {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>                put.add(cell);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>              }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>            lastCell = cell;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>          }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>          // write residual KVs<a name="line.193"></a>
-<span class="sourceLineNo">194</span>          if (put != null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            context.write(tableOut, put);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>          }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>          if (del != null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>            context.write(tableOut, del);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>          }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      } catch (InterruptedException e) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        e.printStackTrace();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>    protected boolean filter(Context context, final Cell cell) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      return true;<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>    @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    protected void<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            throws IOException, InterruptedException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      super.cleanup(context);<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>    @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    public void setup(Context context) throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      if (tableMap == null) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        tableMap = tablesToUse;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      if (tablesToUse == null) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        // Then user wants all tables.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      int i = 0;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      if (tablesToUse != null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        for (String table : tablesToUse) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
-<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><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    String val = conf.get(option);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    if (null == val) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    long ms;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    try {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      // first try to parse in user friendly form<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    } catch (ParseException pe) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      try {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        // then see if just a number of ms's was specified<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        ms = Long.parseLong(val);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      } catch (NumberFormatException nfe) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        throw new IOException(<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                + "or as number of milliseconds");<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>    conf.setLong(option, ms);<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>  /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * Sets up the actual job.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param args The command line parameters.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @return The newly created job.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @throws IOException When setting up the job fails.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   */<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    Configuration conf = getConf();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    String inputDirs = args[0];<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    String[] tables = args[1].split(",");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    String[] tableMap;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if (args.length &gt; 2) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      tableMap = args[2].split(",");<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      if (tableMap.length != tables.length) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    } else {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      // if not mapping is specified map each table to itself<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      tableMap = tables;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    Job job =<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    job.setJarByClass(WALPlayer.class);<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (hfileOutPath != null) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>      // the bulk HFile case<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      job.setReducerClass(CellSortReducer.class);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      Path outputDir = new Path(hfileOutPath);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        for (TableName tableName : tableNames) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          Table table = conn.getTable(tableName);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      // output to live cluster<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      job.setMapperClass(WALMapper.class);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      TableMapReduceUtil.initCredentials(job);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // No reducers.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      job.setNumReduceTasks(0);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    try {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        Class.forName(codecCls));<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    } catch (Exception e) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    return job;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    for (String name : tables) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      list.add(TableName.valueOf(name));<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    return list;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>  /**<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * Print usage<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * @param errorMsg Error message. Can be null.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  private void usage(final String errorMsg) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      System.err.println("ERROR: " + errorMsg);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Time range options:");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    System.err.println("Other options:");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    System.err.println("For performance also consider the following options:\n"<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        + "  -Dmapreduce.reduce.speculative=false");<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>  /**<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   * Main entry point.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * @param args The command line parameters.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   * @throws Exception When running the job fails.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  public static void main(String[] args) throws Exception {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    System.exit(ret);<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>  @Override<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  public int run(String[] args) throws Exception {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " + args.length);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      System.exit(-1);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Job job = createSubmittableJob(args);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 0 : 1;<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">126</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        Thread.currentThread().interrupt();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    public void setup(Context context) throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Configuration conf = context.getConfiguration();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      String[] tables = conf.getStrings(TABLES_KEY);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      this.multiTableSupport = conf.getBoolean(MULTI_TABLES_SUPPORT, false);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      for (String table : tables) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        tableSet.add(table);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * A mapper that writes out {@link Mutation} to be directly applied to a running HBase instance.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  protected static class WALMapper<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      extends Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt; {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    private Map&lt;TableName, TableName&gt; tables = new TreeMap&lt;&gt;();<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public void map(WALKey key, WALEdit value, Context context) throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      try {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        if (tables.isEmpty() || tables.containsKey(key.getTableName())) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>          TableName targetTable =<a name="line.153"></a>
+<span class="sourceLineNo">154</span>              tables.isEmpty() ? key.getTableName() : tables.get(key.getTableName());<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>          Put put = null;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          Delete del = null;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          Cell lastCell = null;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>          for (Cell cell : value.getCells()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            // filtering WAL meta entries<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            if (WALEdit.isMetaEditFamily(cell)) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>              continue;<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>            // Allow a subclass filter out this cell.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            if (filter(context, cell)) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              // A WALEdit may contain multiple operations (HBASE-3584) and/or<a name="line.167"></a>
+<span class="sourceLineNo">168</span>              // multiple rows (HBASE-5229).<a name="line.168"></a>
+<span class="sourceLineNo">169</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.169"></a>
+<span class="sourceLineNo">170</span>              // operation before writing to the context.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                // row or type changed, write out aggregate KVs.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                if (put != null) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>                  context.write(tableOut, put);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                }<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                if (del != null) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>                  context.write(tableOut, del);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>                if (CellUtil.isDelete(cell)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                  del = new Delete(CellUtil.cloneRow(cell));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>                } else {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  put = new Put(CellUtil.cloneRow(cell));<a name="line.183"></a>
+<span class="sourceLineNo">184</span>                }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>              }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>              if (CellUtil.isDelete(cell)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>                del.add(cell);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>              } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>                put.add(cell);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>              }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>            lastCell = cell;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>          }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          // write residual KVs<a name="line.194"></a>
+<span class="sourceLineNo">195</span>          if (put != null) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            context.write(tableOut, put);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>          }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          if (del != null) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            context.write(tableOut, del);<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>      } catch (InterruptedException e) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        LOG.error("Interrupted while writing results", e);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        Thread.currentThread().interrupt();<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 boolean filter(Context context, final Cell cell) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      return true;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    protected void<a name="line.213"></a>
+<span class="sourceLineNo">214</span>        cleanup(Mapper&lt;WALKey, WALEdit, ImmutableBytesWritable, Mutation&gt;.Context context)<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            throws IOException, InterruptedException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      super.cleanup(context);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    public void setup(Context context) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      String[] tableMap = context.getConfiguration().getStrings(TABLE_MAP_KEY);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      String[] tablesToUse = context.getConfiguration().getStrings(TABLES_KEY);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      if (tableMap == null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        tableMap = tablesToUse;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if (tablesToUse == null) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        // Then user wants all tables.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      } else if (tablesToUse.length != tableMap.length) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        // this can only happen when WALMapper is used directly by a class other than WALPlayer<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        throw new IOException("Incorrect table mapping specified .");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      int i = 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (tablesToUse != null) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        for (String table : tablesToUse) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>          tables.put(TableName.valueOf(table), TableName.valueOf(tableMap[i++]));<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>    }<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>  void setupTime(Configuration conf, String option) throws IOException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    String val = conf.get(option);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (null == val) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      return;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    long ms;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    try {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      // first try to parse in user friendly form<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      ms = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SS").parse(val).getTime();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    } catch (ParseException pe) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      try {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        // then see if just a number of ms's was specified<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        ms = Long.parseLong(val);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      } catch (NumberFormatException nfe) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        throw new IOException(<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            option + " must be specified either in the form 2001-02-20T16:35:06.99 "<a name="line.256"></a>
+<span class="sourceLineNo">257</span>                + "or as number of milliseconds");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    conf.setLong(option, ms);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  /**<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   * Sets up the actual job.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param args The command line parameters.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @return The newly created job.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * @throws IOException When setting up the job fails.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public Job createSubmittableJob(String[] args) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    Configuration conf = getConf();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    setupTime(conf, WALInputFormat.START_TIME_KEY);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    setupTime(conf, WALInputFormat.END_TIME_KEY);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    String inputDirs = args[0];<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    String[] tables = args[1].split(",");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    String[] tableMap;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    if (args.length &gt; 2) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      tableMap = args[2].split(",");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (tableMap.length != tables.length) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        throw new IOException("The same number of tables and mapping must be provided.");<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    } else {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      // if not mapping is specified map each table to itself<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      tableMap = tables;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    conf.setStrings(TABLES_KEY, tables);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    conf.setStrings(TABLE_MAP_KEY, tableMap);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    conf.set(FileInputFormat.INPUT_DIR, inputDirs);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    Job job =<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + System.currentTimeMillis()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    job.setJarByClass(WALPlayer.class);<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    job.setInputFormatClass(WALInputFormat.class);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    if (hfileOutPath != null) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      LOG.debug("add incremental job :" + hfileOutPath + " from " + inputDirs);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>      // the bulk HFile case<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      List&lt;TableName&gt; tableNames = getTableNameList(tables);<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>      job.setMapperClass(WALKeyValueMapper.class);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      job.setReducerClass(CellSortReducer.class);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      Path outputDir = new Path(hfileOutPath);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      FileOutputFormat.setOutputPath(job, outputDir);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      try (Connection conn = ConnectionFactory.createConnection(conf);) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        List&lt;TableInfo&gt; tableInfoList = new ArrayList&lt;TableInfo&gt;();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        for (TableName tableName : tableNames) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          Table table = conn.getTable(tableName);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>          tableInfoList.add(new TableInfo(table.getDescriptor(), regionLocator));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        MultiTableHFileOutputFormat.configureIncrementalLoad(job, tableInfoList);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    } else {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      // output to live cluster<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      job.setMapperClass(WALMapper.class);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      job.setOutputFormatClass(MultiTableOutputFormat.class);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      TableMapReduceUtil.addDependencyJars(job);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      TableMapReduceUtil.initCredentials(job);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // No reducers.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      job.setNumReduceTasks(0);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    String codecCls = WALCellCodec.getWALCellCodecClass(conf);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        Class.forName(codecCls));<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } catch (Exception e) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      throw new IOException("Cannot determine wal codec class " + codecCls, e);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    return job;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  private List&lt;TableName&gt; getTableNameList(String[] tables) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    List&lt;TableName&gt; list = new ArrayList&lt;TableName&gt;();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    for (String name : tables) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      list.add(TableName.valueOf(name));<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    return list;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>  }<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>   * Print usage<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * @param errorMsg Error message. Can be null.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  private void usage(final String errorMsg) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      System.err.println("ERROR: " + errorMsg);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("Usage: " + NAME + " [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("Replay all WAL files into HBase.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("&lt;tables&gt; is a comma separated list of tables.");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("If no tables (\"\") are specified, all tables are imported.");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    System.err.println("(Be careful, hbase:meta entries will be imported in this case.)\n");<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    System.err.println("WAL entries can be mapped to new set of tables via &lt;tableMappings&gt;.");<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    System.err.println("&lt;tableMappings&gt; is a comma separated list of target tables.");<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    System.err.println("If specified, each table in &lt;tables&gt; must have a mapping.\n");<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    System.err.println("By default " + NAME + " will load data directly into HBase.");<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    System.err.println("To generate HFiles for a bulk data load instead, pass the following option:");<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    System.err.println("  (Only one table can be specified, and no mapping is allowed!)");<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    System.err.println("Time range options:");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  -D" + WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  -D" + WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  (The start and the end date of timerange. The dates can be expressed");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("  in milliseconds since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  E.g. 1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("Other options:");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("  -D" + JOB_NAME_CONF_KEY + "=jobName");<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    System.err.println("  Use the specified mapreduce job name for the wal player");<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    System.err.println("For performance also consider the following options:\n"<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        + "  -Dmapreduce.reduce.speculative=false");<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>   * Main entry point.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @param args The command line parameters.<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @throws Exception When running the job fails.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  public static void main(String[] args) throws Exception {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    int ret = ToolRunner.run(new WALPlayer(HBaseConfiguration.create()), args);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    System.exit(ret);<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>  @Override<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  public int run(String[] args) throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    if (args.length &lt; 2) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      usage("Wrong number of arguments: " + args.length);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      System.exit(-1);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    Job job = createSubmittableJob(args);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    return job.waitForCompletion(true) ? 0 : 1;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>}<a name="line.398"></a>
 
 
 


[30/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellSortImporter.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      sb.append(sourceCf + ":" + destCf);<a 

<TRUNCATED>

[37/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
index 1c85f39..08653af 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
@@ -154,53 +154,52 @@
 <span class="sourceLineNo">146</span>    // Rethrow the exception so the application can handle it.<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    while (!exceptionsQueue.isEmpty()) {<a name="line.147"></a>
 <span class="sourceLineNo">148</span>      Exception first = exceptionsQueue.peek();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      first.printStackTrace();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      if (first instanceof IOException) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        throw (IOException) first;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      throw (RuntimeException) first;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  private boolean prefetchCondition() {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return cacheSizeInBytes.get() &lt; maxCacheSize / 2;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  private Result pollCache() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    Result res = cache.poll();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    long estimatedSize = calcEstimatedSize(res);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    addEstimatedSize(-estimatedSize);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return res;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private class PrefetchRunnable implements Runnable {<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>    @Override<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public void run() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      while (!closed) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        boolean succeed = false;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        try {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          lock.lock();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>          while (!prefetchCondition()) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            notFull.await();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>          loadCache();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>          succeed = true;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        } catch (Exception e) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>          exceptionsQueue.add(e);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        } finally {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>          notEmpty.signalAll();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          lock.unlock();<a name="line.185"></a>
-<span class="sourceLineNo">186</span>          if (prefetchListener != null) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>            prefetchListener.accept(succeed);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>          }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>}<a name="line.195"></a>
+<span class="sourceLineNo">149</span>      if (first instanceof IOException) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        throw (IOException) first;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      throw (RuntimeException) first;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  private boolean prefetchCondition() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return cacheSizeInBytes.get() &lt; maxCacheSize / 2;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  private Result pollCache() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    Result res = cache.poll();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    long estimatedSize = calcEstimatedSize(res);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    addEstimatedSize(-estimatedSize);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return res;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  private class PrefetchRunnable implements Runnable {<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>    @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    public void run() {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      while (!closed) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        boolean succeed = false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        try {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          lock.lock();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          while (!prefetchCondition()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            notFull.await();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>          }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          loadCache();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          succeed = true;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        } catch (Exception e) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>          exceptionsQueue.add(e);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        } finally {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          notEmpty.signalAll();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          lock.unlock();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          if (prefetchListener != null) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            prefetchListener.accept(succeed);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>}<a name="line.194"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html
index 878793b..a8bfe80 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html
@@ -287,66 +287,65 @@
 <span class="sourceLineNo">279</span>      throws RetriesExhaustedException, DoNotRetryIOException {<a name="line.279"></a>
 <span class="sourceLineNo">280</span>    Throwable t = e.getCause();<a name="line.280"></a>
 <span class="sourceLineNo">281</span>    assert t != null; // That's what ExecutionException is about: holding an exception<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    t.printStackTrace();<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>    if (t instanceof RetriesExhaustedException) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      throw (RetriesExhaustedException) t;<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    if (t instanceof DoNotRetryIOException) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      throw (DoNotRetryIOException) t;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>    RetriesExhaustedException.ThrowableWithExtraContext qt =<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        new RetriesExhaustedException.ThrowableWithExtraContext(t,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>            EnvironmentEdgeManager.currentTime(), null);<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    List&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt; exceptions =<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        Collections.singletonList(qt);<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>    throw new RetriesExhaustedException(retries, exceptions);<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>  /**<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   * Creates the calls and submit them<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   *<a name="line.304"></a>
-<span class="sourceLineNo">305</span>   * @param cs  - the completion service to use for submitting<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   * @param rl  - the region locations<a name="line.306"></a>
-<span class="sourceLineNo">307</span>   * @param min - the id of the first replica, inclusive<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   * @param max - the id of the last replica, inclusive.<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   */<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  private void addCallsForReplica(ResultBoundedCompletionService&lt;Result&gt; cs,<a name="line.310"></a>
-<span class="sourceLineNo">311</span>                                 RegionLocations rl, int min, int max) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    for (int id = min; id &lt;= max; id++) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      HRegionLocation hrl = rl.getRegionLocation(id);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      ReplicaRegionServerCallable callOnReplica = new ReplicaRegionServerCallable(id, hrl);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      cs.submit(callOnReplica, operationTimeout, id);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    }<a name="line.316"></a>
-<span class="sourceLineNo">317</span>  }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>  static RegionLocations getRegionLocations(boolean useCache, int replicaId,<a name="line.319"></a>
-<span class="sourceLineNo">320</span>                 ClusterConnection cConnection, TableName tableName, byte[] row)<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      throws RetriesExhaustedException, DoNotRetryIOException, InterruptedIOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    RegionLocations rl;<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      if (useCache) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        rl = cConnection.locateRegion(tableName, row, true, true, replicaId);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      } else {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        rl = cConnection.relocateRegion(tableName, row, replicaId);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    } catch (DoNotRetryIOException | InterruptedIOException | RetriesExhaustedException e) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      throw e;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    } catch (IOException e) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId, e);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    if (rl == null) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId);<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>    return rl;<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>}<a name="line.341"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>    if (t instanceof RetriesExhaustedException) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      throw (RetriesExhaustedException) t;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>    if (t instanceof DoNotRetryIOException) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      throw (DoNotRetryIOException) t;<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>    RetriesExhaustedException.ThrowableWithExtraContext qt =<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        new RetriesExhaustedException.ThrowableWithExtraContext(t,<a name="line.292"></a>
+<span class="sourceLineNo">293</span>            EnvironmentEdgeManager.currentTime(), null);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    List&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt; exceptions =<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        Collections.singletonList(qt);<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    throw new RetriesExhaustedException(retries, exceptions);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>  }<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>   * Creates the calls and submit them<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   *<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   * @param cs  - the completion service to use for submitting<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   * @param rl  - the region locations<a name="line.305"></a>
+<span class="sourceLineNo">306</span>   * @param min - the id of the first replica, inclusive<a name="line.306"></a>
+<span class="sourceLineNo">307</span>   * @param max - the id of the last replica, inclusive.<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   */<a name="line.308"></a>
+<span class="sourceLineNo">309</span>  private void addCallsForReplica(ResultBoundedCompletionService&lt;Result&gt; cs,<a name="line.309"></a>
+<span class="sourceLineNo">310</span>                                 RegionLocations rl, int min, int max) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    for (int id = min; id &lt;= max; id++) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      HRegionLocation hrl = rl.getRegionLocation(id);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      ReplicaRegionServerCallable callOnReplica = new ReplicaRegionServerCallable(id, hrl);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      cs.submit(callOnReplica, operationTimeout, id);<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><a name="line.317"></a>
+<span class="sourceLineNo">318</span>  static RegionLocations getRegionLocations(boolean useCache, int replicaId,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>                 ClusterConnection cConnection, TableName tableName, byte[] row)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      throws RetriesExhaustedException, DoNotRetryIOException, InterruptedIOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>    RegionLocations rl;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    try {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      if (useCache) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        rl = cConnection.locateRegion(tableName, row, true, true, replicaId);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      } else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        rl = cConnection.relocateRegion(tableName, row, replicaId);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    } catch (DoNotRetryIOException | InterruptedIOException | RetriesExhaustedException e) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      throw e;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } catch (IOException e) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId, e);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    if (rl == null) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId);<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>    return rl;<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>}<a name="line.340"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
index 878793b..a8bfe80 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html
@@ -287,66 +287,65 @@
 <span class="sourceLineNo">279</span>      throws RetriesExhaustedException, DoNotRetryIOException {<a name="line.279"></a>
 <span class="sourceLineNo">280</span>    Throwable t = e.getCause();<a name="line.280"></a>
 <span class="sourceLineNo">281</span>    assert t != null; // That's what ExecutionException is about: holding an exception<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    t.printStackTrace();<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>    if (t instanceof RetriesExhaustedException) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      throw (RetriesExhaustedException) t;<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    if (t instanceof DoNotRetryIOException) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      throw (DoNotRetryIOException) t;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>    RetriesExhaustedException.ThrowableWithExtraContext qt =<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        new RetriesExhaustedException.ThrowableWithExtraContext(t,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>            EnvironmentEdgeManager.currentTime(), null);<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    List&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt; exceptions =<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        Collections.singletonList(qt);<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>    throw new RetriesExhaustedException(retries, exceptions);<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>  /**<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   * Creates the calls and submit them<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   *<a name="line.304"></a>
-<span class="sourceLineNo">305</span>   * @param cs  - the completion service to use for submitting<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   * @param rl  - the region locations<a name="line.306"></a>
-<span class="sourceLineNo">307</span>   * @param min - the id of the first replica, inclusive<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   * @param max - the id of the last replica, inclusive.<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   */<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  private void addCallsForReplica(ResultBoundedCompletionService&lt;Result&gt; cs,<a name="line.310"></a>
-<span class="sourceLineNo">311</span>                                 RegionLocations rl, int min, int max) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    for (int id = min; id &lt;= max; id++) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      HRegionLocation hrl = rl.getRegionLocation(id);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      ReplicaRegionServerCallable callOnReplica = new ReplicaRegionServerCallable(id, hrl);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      cs.submit(callOnReplica, operationTimeout, id);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    }<a name="line.316"></a>
-<span class="sourceLineNo">317</span>  }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>  static RegionLocations getRegionLocations(boolean useCache, int replicaId,<a name="line.319"></a>
-<span class="sourceLineNo">320</span>                 ClusterConnection cConnection, TableName tableName, byte[] row)<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      throws RetriesExhaustedException, DoNotRetryIOException, InterruptedIOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    RegionLocations rl;<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      if (useCache) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        rl = cConnection.locateRegion(tableName, row, true, true, replicaId);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      } else {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        rl = cConnection.relocateRegion(tableName, row, replicaId);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    } catch (DoNotRetryIOException | InterruptedIOException | RetriesExhaustedException e) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      throw e;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    } catch (IOException e) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId, e);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    if (rl == null) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId);<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>    return rl;<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>}<a name="line.341"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>    if (t instanceof RetriesExhaustedException) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      throw (RetriesExhaustedException) t;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>    if (t instanceof DoNotRetryIOException) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      throw (DoNotRetryIOException) t;<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>    RetriesExhaustedException.ThrowableWithExtraContext qt =<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        new RetriesExhaustedException.ThrowableWithExtraContext(t,<a name="line.292"></a>
+<span class="sourceLineNo">293</span>            EnvironmentEdgeManager.currentTime(), null);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    List&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt; exceptions =<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        Collections.singletonList(qt);<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    throw new RetriesExhaustedException(retries, exceptions);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>  }<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>   * Creates the calls and submit them<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   *<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   * @param cs  - the completion service to use for submitting<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   * @param rl  - the region locations<a name="line.305"></a>
+<span class="sourceLineNo">306</span>   * @param min - the id of the first replica, inclusive<a name="line.306"></a>
+<span class="sourceLineNo">307</span>   * @param max - the id of the last replica, inclusive.<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   */<a name="line.308"></a>
+<span class="sourceLineNo">309</span>  private void addCallsForReplica(ResultBoundedCompletionService&lt;Result&gt; cs,<a name="line.309"></a>
+<span class="sourceLineNo">310</span>                                 RegionLocations rl, int min, int max) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    for (int id = min; id &lt;= max; id++) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      HRegionLocation hrl = rl.getRegionLocation(id);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      ReplicaRegionServerCallable callOnReplica = new ReplicaRegionServerCallable(id, hrl);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      cs.submit(callOnReplica, operationTimeout, id);<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><a name="line.317"></a>
+<span class="sourceLineNo">318</span>  static RegionLocations getRegionLocations(boolean useCache, int replicaId,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>                 ClusterConnection cConnection, TableName tableName, byte[] row)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      throws RetriesExhaustedException, DoNotRetryIOException, InterruptedIOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>    RegionLocations rl;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    try {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      if (useCache) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        rl = cConnection.locateRegion(tableName, row, true, true, replicaId);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      } else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        rl = cConnection.relocateRegion(tableName, row, replicaId);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    } catch (DoNotRetryIOException | InterruptedIOException | RetriesExhaustedException e) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      throw e;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    } catch (IOException e) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId, e);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    if (rl == null) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      throw new RetriesExhaustedException("Can't get the location for replica " + replicaId);<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>    return rl;<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>}<a name="line.340"></a>
 
 
 


[24/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
index cca6b6f..7891753 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.Uploader.html
@@ -43,121 +43,125 @@
 <span class="sourceLineNo">035</span>import org.apache.hadoop.util.Tool;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import org.apache.hadoop.util.ToolRunner;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Sample Uploader MapReduce<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * This is EXAMPLE code.  You will need to change it to work for your context.<a name="line.42"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Sample Uploader MapReduce<a name="line.42"></a>
 <span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Uses {@link TableReducer} to put the data into HBase. Change the InputFormat<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * to suit your data.  In this example, we are importing a CSV file.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * &lt;p&gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;pre&gt;row,family,qualifier,value&lt;/pre&gt;<a name="line.47"></a>
+<span class="sourceLineNo">044</span> * This is EXAMPLE code.  You will need to change it to work for your context.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * &lt;p&gt;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Uses {@link TableReducer} to put the data into HBase. Change the InputFormat<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * to suit your data.  In this example, we are importing a CSV file.<a name="line.47"></a>
 <span class="sourceLineNo">048</span> * &lt;p&gt;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * The table and columnfamily we're to insert into must preexist.<a name="line.49"></a>
+<span class="sourceLineNo">049</span> * &lt;pre&gt;row,family,qualifier,value&lt;/pre&gt;<a name="line.49"></a>
 <span class="sourceLineNo">050</span> * &lt;p&gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * There is no reducer in this example as it is not necessary and adds<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * significant overhead.  If you need to do any massaging of data before<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * inserting into HBase, you can do this in the map as well.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * &lt;p&gt;Do the following to start the MR job:<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;pre&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * ./bin/hadoop org.apache.hadoop.hbase.mapreduce.SampleUploader /tmp/input.csv TABLE_NAME<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * &lt;/pre&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * &lt;p&gt;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * This code was written against HBase 0.21 trunk.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@InterfaceAudience.Private<a name="line.61"></a>
-<span class="sourceLineNo">062</span>public class SampleUploader extends Configured implements Tool {<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final String NAME = "SampleUploader";<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  static class Uploader<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  extends Mapper&lt;LongWritable, Text, ImmutableBytesWritable, Put&gt; {<a name="line.67"></a>
+<span class="sourceLineNo">051</span> * The table and columnfamily we're to insert into must preexist.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * &lt;p&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * There is no reducer in this example as it is not necessary and adds<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * significant overhead.  If you need to do any massaging of data before<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * inserting into HBase, you can do this in the map as well.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;p&gt;Do the following to start the MR job:<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * &lt;pre&gt;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * ./bin/hadoop org.apache.hadoop.hbase.mapreduce.SampleUploader /tmp/input.csv TABLE_NAME<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * &lt;/pre&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * &lt;p&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * This code was written against HBase 0.21 trunk.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>@InterfaceAudience.Private<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public class SampleUploader extends Configured implements Tool {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private static final Logger LOG = LoggerFactory.getLogger(SampleUploader.class);<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  private static final String NAME = "SampleUploader";<a name="line.67"></a>
 <span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>    private long checkpoint = 100;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    private long count = 0;<a name="line.70"></a>
+<span class="sourceLineNo">069</span>  static class Uploader<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  extends Mapper&lt;LongWritable, Text, ImmutableBytesWritable, Put&gt; {<a name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>    @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    public void map(LongWritable key, Text line, Context context)<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    throws IOException {<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>      // Input is a CSV file<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      // Each map() is a single line, where the key is the line number<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      // Each line is comma-delimited; row,family,qualifier,value<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>      // Split CSV line<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      String [] values = line.toString().split(",");<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      if(values.length != 4) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>        return;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>      // Extract each value<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      byte [] row = Bytes.toBytes(values[0]);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      byte [] family = Bytes.toBytes(values[1]);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      byte [] qualifier = Bytes.toBytes(values[2]);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      byte [] value = Bytes.toBytes(values[3]);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>      // Create Put<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      Put put = new Put(row);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      put.addColumn(family, qualifier, value);<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>      // Uncomment below to disable WAL. This will improve performance but means<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      // you will experience data loss in the case of a RegionServer crash.<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      // put.setWriteToWAL(false);<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>      try {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        context.write(new ImmutableBytesWritable(row), put);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      } catch (InterruptedException e) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        e.printStackTrace();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>      // Set status every checkpoint lines<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      if(++count % checkpoint == 0) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        context.setStatus("Emitting Put " + count);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      }<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * Job configuration.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public static Job configureJob(Configuration conf, String [] args)<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  throws IOException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    Path inputPath = new Path(args[0]);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    String tableName = args[1];<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    Job job = new Job(conf, NAME + "_" + tableName);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    job.setJarByClass(Uploader.class);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    FileInputFormat.setInputPaths(job, inputPath);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    job.setMapperClass(Uploader.class);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // because it sets up the TableOutputFormat.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    TableMapReduceUtil.initTableReducerJob(tableName, null, job);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    job.setNumReduceTasks(0);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    return job;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>  }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * Main entry point.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   *<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * @param otherArgs  The command line parameters after ToolRunner handles standard.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   * @throws Exception When running the job fails.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public int run(String[] otherArgs) throws Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if(otherArgs.length != 2) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      System.err.println("Wrong number of arguments: " + otherArgs.length);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      System.err.println("Usage: " + NAME + " &lt;input&gt; &lt;tablename&gt;");<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Job job = configureJob(getConf(), otherArgs);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  public static void main(String[] args) throws Exception {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    int status = ToolRunner.run(HBaseConfiguration.create(), new SampleUploader(), args);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    System.exit(status);<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">072</span>    private long checkpoint = 100;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    private long count = 0;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    @Override<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    public void map(LongWritable key, Text line, Context context)<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    throws IOException {<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>      // Input is a CSV file<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      // Each map() is a single line, where the key is the line number<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      // Each line is comma-delimited; row,family,qualifier,value<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>      // Split CSV line<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      String [] values = line.toString().split(",");<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      if(values.length != 4) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        return;<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>      // Extract each value<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      byte [] row = Bytes.toBytes(values[0]);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      byte [] family = Bytes.toBytes(values[1]);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      byte [] qualifier = Bytes.toBytes(values[2]);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      byte [] value = Bytes.toBytes(values[3]);<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>      // Create Put<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      Put put = new Put(row);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      put.addColumn(family, qualifier, value);<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>      // Uncomment below to disable WAL. This will improve performance but means<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      // you will experience data loss in the case of a RegionServer crash.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      // put.setWriteToWAL(false);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>      try {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        context.write(new ImmutableBytesWritable(row), put);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      } catch (InterruptedException e) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        LOG.error("Interrupted emitting put", e);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>        Thread.currentThread().interrupt();<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>      // Set status every checkpoint lines<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      if(++count % checkpoint == 0) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        context.setStatus("Emitting Put " + count);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Job configuration.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public static Job configureJob(Configuration conf, String [] args)<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  throws IOException {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    Path inputPath = new Path(args[0]);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    String tableName = args[1];<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    Job job = new Job(conf, NAME + "_" + tableName);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    job.setJarByClass(Uploader.class);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    FileInputFormat.setInputPaths(job, inputPath);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    job.setMapperClass(Uploader.class);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    // because it sets up the TableOutputFormat.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    TableMapReduceUtil.initTableReducerJob(tableName, null, job);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    job.setNumReduceTasks(0);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return job;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * Main entry point.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   *<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * @param otherArgs  The command line parameters after ToolRunner handles standard.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   * @throws Exception When running the job fails.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public int run(String[] otherArgs) throws Exception {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    if(otherArgs.length != 2) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      System.err.println("Wrong number of arguments: " + otherArgs.length);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      System.err.println("Usage: " + NAME + " &lt;input&gt; &lt;tablename&gt;");<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      return -1;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    Job job = configureJob(getConf(), otherArgs);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return (job.waitForCompletion(true) ? 0 : 1);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public static void main(String[] args) throws Exception {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    int status = ToolRunner.run(HBaseConfiguration.create(), new SampleUploader(), args);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    System.exit(status);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>}<a name="line.156"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
index cca6b6f..7891753 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SampleUploader.html
@@ -43,121 +43,125 @@
 <span class="sourceLineNo">035</span>import org.apache.hadoop.util.Tool;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import org.apache.hadoop.util.ToolRunner;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Sample Uploader MapReduce<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * This is EXAMPLE code.  You will need to change it to work for your context.<a name="line.42"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Sample Uploader MapReduce<a name="line.42"></a>
 <span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Uses {@link TableReducer} to put the data into HBase. Change the InputFormat<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * to suit your data.  In this example, we are importing a CSV file.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * &lt;p&gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;pre&gt;row,family,qualifier,value&lt;/pre&gt;<a name="line.47"></a>
+<span class="sourceLineNo">044</span> * This is EXAMPLE code.  You will need to change it to work for your context.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * &lt;p&gt;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Uses {@link TableReducer} to put the data into HBase. Change the InputFormat<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * to suit your data.  In this example, we are importing a CSV file.<a name="line.47"></a>
 <span class="sourceLineNo">048</span> * &lt;p&gt;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * The table and columnfamily we're to insert into must preexist.<a name="line.49"></a>
+<span class="sourceLineNo">049</span> * &lt;pre&gt;row,family,qualifier,value&lt;/pre&gt;<a name="line.49"></a>
 <span class="sourceLineNo">050</span> * &lt;p&gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * There is no reducer in this example as it is not necessary and adds<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * significant overhead.  If you need to do any massaging of data before<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * inserting into HBase, you can do this in the map as well.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * &lt;p&gt;Do the following to start the MR job:<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * &lt;pre&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * ./bin/hadoop org.apache.hadoop.hbase.mapreduce.SampleUploader /tmp/input.csv TABLE_NAME<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * &lt;/pre&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * &lt;p&gt;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * This code was written against HBase 0.21 trunk.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@InterfaceAudience.Private<a name="line.61"></a>
-<span class="sourceLineNo">062</span>public class SampleUploader extends Configured implements Tool {<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final String NAME = "SampleUploader";<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  static class Uploader<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  extends Mapper&lt;LongWritable, Text, ImmutableBytesWritable, Put&gt; {<a name="line.67"></a>
+<span class="sourceLineNo">051</span> * The table and columnfamily we're to insert into must preexist.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * &lt;p&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * There is no reducer in this example as it is not necessary and adds<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * significant overhead.  If you need to do any massaging of data before<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * inserting into HBase, you can do this in the map as well.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;p&gt;Do the following to start the MR job:<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * &lt;pre&gt;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * ./bin/hadoop org.apache.hadoop.hbase.mapreduce.SampleUploader /tmp/input.csv TABLE_NAME<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * &lt;/pre&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * &lt;p&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * This code was written against HBase 0.21 trunk.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>@InterfaceAudience.Private<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public class SampleUploader extends Configured implements Tool {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private static final Logger LOG = LoggerFactory.getLogger(SampleUploader.class);<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  private static final String NAME = "SampleUploader";<a name="line.67"></a>
 <span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>    private long checkpoint = 100;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    private long count = 0;<a name="line.70"></a>
+<span class="sourceLineNo">069</span>  static class Uploader<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  extends Mapper&lt;LongWritable, Text, ImmutableBytesWritable, Put&gt; {<a name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>    @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    public void map(LongWritable key, Text line, Context context)<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    throws IOException {<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>      // Input is a CSV file<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      // Each map() is a single line, where the key is the line number<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      // Each line is comma-delimited; row,family,qualifier,value<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>      // Split CSV line<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      String [] values = line.toString().split(",");<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      if(values.length != 4) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>        return;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>      // Extract each value<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      byte [] row = Bytes.toBytes(values[0]);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      byte [] family = Bytes.toBytes(values[1]);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      byte [] qualifier = Bytes.toBytes(values[2]);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      byte [] value = Bytes.toBytes(values[3]);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>      // Create Put<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      Put put = new Put(row);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      put.addColumn(family, qualifier, value);<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>      // Uncomment below to disable WAL. This will improve performance but means<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      // you will experience data loss in the case of a RegionServer crash.<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      // put.setWriteToWAL(false);<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>      try {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        context.write(new ImmutableBytesWritable(row), put);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      } catch (InterruptedException e) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        e.printStackTrace();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>      // Set status every checkpoint lines<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      if(++count % checkpoint == 0) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        context.setStatus("Emitting Put " + count);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      }<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * Job configuration.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public static Job configureJob(Configuration conf, String [] args)<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  throws IOException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    Path inputPath = new Path(args[0]);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    String tableName = args[1];<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    Job job = new Job(conf, NAME + "_" + tableName);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    job.setJarByClass(Uploader.class);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    FileInputFormat.setInputPaths(job, inputPath);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    job.setMapperClass(Uploader.class);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // because it sets up the TableOutputFormat.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    TableMapReduceUtil.initTableReducerJob(tableName, null, job);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    job.setNumReduceTasks(0);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    return job;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>  }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * Main entry point.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   *<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * @param otherArgs  The command line parameters after ToolRunner handles standard.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   * @throws Exception When running the job fails.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public int run(String[] otherArgs) throws Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if(otherArgs.length != 2) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      System.err.println("Wrong number of arguments: " + otherArgs.length);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      System.err.println("Usage: " + NAME + " &lt;input&gt; &lt;tablename&gt;");<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Job job = configureJob(getConf(), otherArgs);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    return (job.waitForCompletion(true) ? 0 : 1);<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>  public static void main(String[] args) throws Exception {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    int status = ToolRunner.run(HBaseConfiguration.create(), new SampleUploader(), args);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    System.exit(status);<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">072</span>    private long checkpoint = 100;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    private long count = 0;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    @Override<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    public void map(LongWritable key, Text line, Context context)<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    throws IOException {<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>      // Input is a CSV file<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      // Each map() is a single line, where the key is the line number<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      // Each line is comma-delimited; row,family,qualifier,value<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>      // Split CSV line<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      String [] values = line.toString().split(",");<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      if(values.length != 4) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        return;<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>      // Extract each value<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      byte [] row = Bytes.toBytes(values[0]);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      byte [] family = Bytes.toBytes(values[1]);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      byte [] qualifier = Bytes.toBytes(values[2]);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      byte [] value = Bytes.toBytes(values[3]);<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>      // Create Put<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      Put put = new Put(row);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      put.addColumn(family, qualifier, value);<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>      // Uncomment below to disable WAL. This will improve performance but means<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      // you will experience data loss in the case of a RegionServer crash.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      // put.setWriteToWAL(false);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>      try {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        context.write(new ImmutableBytesWritable(row), put);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      } catch (InterruptedException e) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        LOG.error("Interrupted emitting put", e);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>        Thread.currentThread().interrupt();<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>      // Set status every checkpoint lines<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      if(++count % checkpoint == 0) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        context.setStatus("Emitting Put " + count);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Job configuration.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public static Job configureJob(Configuration conf, String [] args)<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  throws IOException {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    Path inputPath = new Path(args[0]);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    String tableName = args[1];<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    Job job = new Job(conf, NAME + "_" + tableName);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    job.setJarByClass(Uploader.class);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    FileInputFormat.setInputPaths(job, inputPath);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    job.setMapperClass(Uploader.class);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    // because it sets up the TableOutputFormat.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    TableMapReduceUtil.initTableReducerJob(tableName, null, job);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    job.setNumReduceTasks(0);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return job;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * Main entry point.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   *<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * @param otherArgs  The command line parameters after ToolRunner handles standard.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   * @throws Exception When running the job fails.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public int run(String[] otherArgs) throws Exception {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    if(otherArgs.length != 2) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      System.err.println("Wrong number of arguments: " + otherArgs.length);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      System.err.println("Usage: " + NAME + " &lt;input&gt; &lt;tablename&gt;");<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      return -1;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    Job job = configureJob(getConf(), otherArgs);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return (job.waitForCompletion(true) ? 0 : 1);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public static void main(String[] args) throws Exception {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    int status = ToolRunner.run(HBaseConfiguration.create(), new SampleUploader(), args);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    System.exit(status);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>}<a name="line.156"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.CellScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.CellScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.CellScanner.html
index b6817d9..cb461aa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.CellScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.CellScanner.html
@@ -787,7 +787,7 @@
 <span class="sourceLineNo">779</span><a name="line.779"></a>
 <span class="sourceLineNo">780</span><a name="line.780"></a>
 <span class="sourceLineNo">781</span>    } catch (Exception e) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      e.printStackTrace();<a name="line.782"></a>
+<span class="sourceLineNo">782</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      printUsage("Can't start because " + e.getMessage());<a name="line.783"></a>
 <span class="sourceLineNo">784</span>      return false;<a name="line.784"></a>
 <span class="sourceLineNo">785</span>    }<a name="line.785"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html
index b6817d9..cb461aa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html
@@ -787,7 +787,7 @@
 <span class="sourceLineNo">779</span><a name="line.779"></a>
 <span class="sourceLineNo">780</span><a name="line.780"></a>
 <span class="sourceLineNo">781</span>    } catch (Exception e) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      e.printStackTrace();<a name="line.782"></a>
+<span class="sourceLineNo">782</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      printUsage("Can't start because " + e.getMessage());<a name="line.783"></a>
 <span class="sourceLineNo">784</span>      return false;<a name="line.784"></a>
 <span class="sourceLineNo">785</span>    }<a name="line.785"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.html
index b6817d9..cb461aa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.html
@@ -787,7 +787,7 @@
 <span class="sourceLineNo">779</span><a name="line.779"></a>
 <span class="sourceLineNo">780</span><a name="line.780"></a>
 <span class="sourceLineNo">781</span>    } catch (Exception e) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      e.printStackTrace();<a name="line.782"></a>
+<span class="sourceLineNo">782</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      printUsage("Can't start because " + e.getMessage());<a name="line.783"></a>
 <span class="sourceLineNo">784</span>      return false;<a name="line.784"></a>
 <span class="sourceLineNo">785</span>    }<a name="line.785"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.html
index b6817d9..cb461aa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/SyncTable.html
@@ -787,7 +787,7 @@
 <span class="sourceLineNo">779</span><a name="line.779"></a>
 <span class="sourceLineNo">780</span><a name="line.780"></a>
 <span class="sourceLineNo">781</span>    } catch (Exception e) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      e.printStackTrace();<a name="line.782"></a>
+<span class="sourceLineNo">782</span>      LOG.error("Failed to parse commandLine arguments", e);<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      printUsage("Can't start because " + e.getMessage());<a name="line.783"></a>
 <span class="sourceLineNo">784</span>      return false;<a name="line.784"></a>
 <span class="sourceLineNo">785</span>    }<a name="line.785"></a>

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


[39/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 45475a1..0094c11 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -708,20 +708,20 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index b377318..2731576 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
index f0c55c8..19354d1 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
@@ -247,9 +247,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">ProtobufLogReader.WALHdrResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
index 3c7146a..f8e4b11 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
@@ -160,8 +160,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeer.PeerState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeer.PeerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/SyncReplicationState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">SyncReplicationState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeer.PeerState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeer.PeerState</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index 69f2dc6..8051208 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -142,8 +142,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index dfa02b5..6ef281d 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -191,9 +191,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/thrift/DemoClient.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/DemoClient.html b/devapidocs/org/apache/hadoop/hbase/thrift/DemoClient.html
index e3013d5..79fca77 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/DemoClient.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/DemoClient.html
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.56">DemoClient</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.58">DemoClient</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">See the instructions under hbase-examples/README.txt</div>
 </li>
@@ -140,14 +140,18 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/DemoClient.html#host">host</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/DemoClient.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>protected static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/DemoClient.html#port">port</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/DemoClient.html#secure">secure</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/DemoClient.html#serverPrincipal">serverPrincipal</a></span></code>&nbsp;</td>
 </tr>
@@ -242,13 +246,22 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.59">LOG</a></pre>
+</li>
+</ul>
 <a name="port">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>protected static&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.58">port</a></pre>
+<pre>protected static&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.61">port</a></pre>
 </li>
 </ul>
 <a name="host">
@@ -257,7 +270,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>host</h4>
-<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/DemoClient.html#line.59">host</a></pre>
+<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/DemoClient.html#line.62">host</a></pre>
 </li>
 </ul>
 <a name="decoder">
@@ -266,7 +279,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>decoder</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharsetDecoder.html?is-external=true" title="class or interface in java.nio.charset">CharsetDecoder</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.60">decoder</a></pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharsetDecoder.html?is-external=true" title="class or interface in java.nio.charset">CharsetDecoder</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.63">decoder</a></pre>
 </li>
 </ul>
 <a name="secure">
@@ -275,7 +288,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>secure</h4>
-<pre>private static&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.62">secure</a></pre>
+<pre>private static&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.65">secure</a></pre>
 </li>
 </ul>
 <a name="serverPrincipal">
@@ -284,7 +297,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>serverPrincipal</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/DemoClient.html#line.63">serverPrincipal</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/DemoClient.html#line.66">serverPrincipal</a></pre>
 </li>
 </ul>
 </li>
@@ -301,7 +314,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DemoClient</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.100">DemoClient</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.103">DemoClient</a>()</pre>
 </li>
 </ul>
 </li>
@@ -318,7 +331,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.65">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.68">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -332,7 +345,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>isBoolean</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.96">isBoolean</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.99">isBoolean</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 </li>
 </ul>
 <a name="utf8-byte:A-">
@@ -341,7 +354,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>utf8</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.105">utf8</a>(byte[]&nbsp;buf)</pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.108">utf8</a>(byte[]&nbsp;buf)</pre>
 </li>
 </ul>
 <a name="bytes-java.lang.String-">
@@ -350,7 +363,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>bytes</h4>
-<pre>private&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.114">bytes</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>private&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.117">bytes</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 </li>
 </ul>
 <a name="run--">
@@ -359,7 +372,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.123">run</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.126">run</a>()
           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -373,7 +386,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>printVersions</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.347">printVersions</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.350">printVersions</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                            <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;versions)</pre>
 </li>
 </ul>
@@ -383,7 +396,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>printRow</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.356">printRow</a>(org.apache.hadoop.hbase.thrift.generated.TRowResult&nbsp;rowResult)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.359">printRow</a>(org.apache.hadoop.hbase.thrift.generated.TRowResult&nbsp;rowResult)</pre>
 </li>
 </ul>
 <a name="printRow-java.util.List-">
@@ -392,7 +405,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>printRow</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.374">printRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;rows)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.377">printRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;rows)</pre>
 </li>
 </ul>
 <a name="getSubject--">
@@ -401,7 +414,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getSubject</h4>
-<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/javax/security/auth/Subject.html?is-external=true" title="class or interface in javax.security.auth">Subject</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.380">getSubject</a>()
+<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/javax/security/auth/Subject.html?is-external=true" title="class or interface in javax.security.auth">Subject</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/DemoClient.html#line.383">getSubject</a>()
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html b/devapidocs/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
index c04a336..8690fde 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.61">HttpDoAsClient</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.63">HttpDoAsClient</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">See the instructions under hbase-examples/README.txt</div>
 </li>
@@ -144,14 +144,18 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#host">host</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>protected static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#port">port</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#principal">principal</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#secure">secure</a></span></code>&nbsp;</td>
 </tr>
@@ -247,13 +251,22 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.64">LOG</a></pre>
+</li>
+</ul>
 <a name="port">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>protected static&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.63">port</a></pre>
+<pre>protected static&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.66">port</a></pre>
 </li>
 </ul>
 <a name="host">
@@ -262,7 +275,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>host</h4>
-<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/HttpDoAsClient.html#line.64">host</a></pre>
+<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/HttpDoAsClient.html#line.67">host</a></pre>
 </li>
 </ul>
 <a name="decoder">
@@ -271,7 +284,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>decoder</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharsetDecoder.html?is-external=true" title="class or interface in java.nio.charset">CharsetDecoder</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.65">decoder</a></pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/CharsetDecoder.html?is-external=true" title="class or interface in java.nio.charset">CharsetDecoder</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.68">decoder</a></pre>
 </li>
 </ul>
 <a name="secure">
@@ -280,7 +293,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>secure</h4>
-<pre>private static&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.66">secure</a></pre>
+<pre>private static&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.69">secure</a></pre>
 </li>
 </ul>
 <a name="doAsUser">
@@ -289,7 +302,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>doAsUser</h4>
-<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/HttpDoAsClient.html#line.67">doAsUser</a></pre>
+<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/HttpDoAsClient.html#line.70">doAsUser</a></pre>
 </li>
 </ul>
 <a name="principal">
@@ -298,7 +311,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>principal</h4>
-<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/HttpDoAsClient.html#line.68">principal</a></pre>
+<pre>protected static&nbsp;<a href="https://docs.oracle.com/javase/8/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/thrift/HttpDoAsClient.html#line.71">principal</a></pre>
 </li>
 </ul>
 </li>
@@ -315,7 +328,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HttpDoAsClient</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.98">HttpDoAsClient</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.101">HttpDoAsClient</a>()</pre>
 </li>
 </ul>
 </li>
@@ -332,7 +345,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.70">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.73">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -346,7 +359,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>utf8</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.103">utf8</a>(byte[]&nbsp;buf)</pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.106">utf8</a>(byte[]&nbsp;buf)</pre>
 </li>
 </ul>
 <a name="bytes-java.lang.String-">
@@ -355,7 +368,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>bytes</h4>
-<pre>private&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.112">bytes</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>private&nbsp;byte[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.115">bytes</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 </li>
 </ul>
 <a name="run--">
@@ -364,7 +377,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.121">run</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.124">run</a>()
           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -378,7 +391,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>refresh</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.thrift.generated.Hbase.Client&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.185">refresh</a>(org.apache.hadoop.hbase.thrift.generated.Hbase.Client&nbsp;client,
+<pre>private&nbsp;org.apache.hadoop.hbase.thrift.generated.Hbase.Client&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.188">refresh</a>(org.apache.hadoop.hbase.thrift.generated.Hbase.Client&nbsp;client,
                                                                       org.apache.thrift.transport.THttpClient&nbsp;httpClient)</pre>
 </li>
 </ul>
@@ -388,7 +401,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>generateTicket</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.197">generateTicket</a>()
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.200">generateTicket</a>()
                        throws <a href="https://docs.oracle.com/javase/8/docs/api/org/ietf/jgss/GSSException.html?is-external=true" title="class or interface in org.ietf.jgss">GSSException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -402,7 +415,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>printVersions</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.227">printVersions</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.230">printVersions</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                            <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;versions)</pre>
 </li>
 </ul>
@@ -412,7 +425,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>printRow</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.236">printRow</a>(org.apache.hadoop.hbase.thrift.generated.TRowResult&nbsp;rowResult)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.239">printRow</a>(org.apache.hadoop.hbase.thrift.generated.TRowResult&nbsp;rowResult)</pre>
 </li>
 </ul>
 <a name="getSubject--">
@@ -421,7 +434,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getSubject</h4>
-<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/javax/security/auth/Subject.html?is-external=true" title="class or interface in javax.security.auth">Subject</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.254">getSubject</a>()
+<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/javax/security/auth/Subject.html?is-external=true" title="class or interface in javax.security.auth">Subject</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/HttpDoAsClient.html#line.257">getSubject</a>()
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 2e32f29..45de9e9 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -515,14 +515,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/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.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html b/devapidocs/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
index 3cc25e3..eff8e9f 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>@InterfaceAudience.LimitedPrivate(value="Tools")
  @InterfaceStability.Evolving
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.69">WALPrettyPrinter</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.71">WALPrettyPrinter</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">WALPrettyPrinter prints the contents of a given WAL with a variety of
  options affecting formatting and extent of content.
@@ -146,34 +146,38 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#firstTxn">firstTxn</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private static com.fasterxml.jackson.databind.ObjectMapper</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#MAPPER">MAPPER</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#out">out</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#outputJSON">outputJSON</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#outputValues">outputValues</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#persistentOutput">persistentOutput</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#region">region</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#row">row</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#sequence">sequence</a></span></code>&nbsp;</td>
 </tr>
@@ -321,13 +325,22 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.72">LOG</a></pre>
+</li>
+</ul>
 <a name="outputValues">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>outputValues</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.70">outputValues</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.74">outputValues</a></pre>
 </li>
 </ul>
 <a name="outputJSON">
@@ -336,7 +349,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>outputJSON</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.71">outputJSON</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.75">outputJSON</a></pre>
 </li>
 </ul>
 <a name="sequence">
@@ -345,7 +358,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>sequence</h4>
-<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.73">sequence</a></pre>
+<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.77">sequence</a></pre>
 </li>
 </ul>
 <a name="region">
@@ -354,7 +367,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>region</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/WALPrettyPrinter.html#line.74">region</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/WALPrettyPrinter.html#line.78">region</a></pre>
 </li>
 </ul>
 <a name="row">
@@ -363,7 +376,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>row</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/WALPrettyPrinter.html#line.75">row</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/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/wal/WALPrettyPrinter.html#line.79">row</a></pre>
 </li>
 </ul>
 <a name="persistentOutput">
@@ -372,7 +385,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>persistentOutput</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.77">persistentOutput</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.81">persistentOutput</a></pre>
 </li>
 </ul>
 <a name="firstTxn">
@@ -381,7 +394,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>firstTxn</h4>
-<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.78">firstTxn</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.82">firstTxn</a></pre>
 </li>
 </ul>
 <a name="out">
@@ -390,7 +403,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.80">out</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.84">out</a></pre>
 </li>
 </ul>
 <a name="MAPPER">
@@ -399,7 +412,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MAPPER</h4>
-<pre>private static final&nbsp;com.fasterxml.jackson.databind.ObjectMapper <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.82">MAPPER</a></pre>
+<pre>private static final&nbsp;com.fasterxml.jackson.databind.ObjectMapper <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.86">MAPPER</a></pre>
 </li>
 </ul>
 </li>
@@ -416,7 +429,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>WALPrettyPrinter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.87">WALPrettyPrinter</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.91">WALPrettyPrinter</a>()</pre>
 <div class="block">Basic constructor that simply initializes values to reasonable defaults.</div>
 </li>
 </ul>
@@ -426,7 +439,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WALPrettyPrinter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.123">WALPrettyPrinter</a>(boolean&nbsp;outputValues,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.127">WALPrettyPrinter</a>(boolean&nbsp;outputValues,
                         boolean&nbsp;outputJSON,
                         long&nbsp;sequence,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;region,
@@ -467,7 +480,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>enableValues</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.142">enableValues</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.146">enableValues</a>()</pre>
 <div class="block">turns value output on</div>
 </li>
 </ul>
@@ -477,7 +490,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>disableValues</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.149">disableValues</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.153">disableValues</a>()</pre>
 <div class="block">turns value output off</div>
 </li>
 </ul>
@@ -487,7 +500,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>enableJSON</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.156">enableJSON</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.160">enableJSON</a>()</pre>
 <div class="block">turns JSON output on</div>
 </li>
 </ul>
@@ -497,7 +510,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>disableJSON</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.163">disableJSON</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.167">disableJSON</a>()</pre>
 <div class="block">turns JSON output off, and turns on "pretty strings" for human consumption</div>
 </li>
 </ul>
@@ -507,7 +520,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setSequenceFilter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.174">setSequenceFilter</a>(long&nbsp;sequence)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.178">setSequenceFilter</a>(long&nbsp;sequence)</pre>
 <div class="block">sets the region by which output will be filtered</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -522,7 +535,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setRegionFilter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.185">setRegionFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;region)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.189">setRegionFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;region)</pre>
 <div class="block">sets the region by which output will be filtered</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -537,7 +550,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setRowFilter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.196">setRowFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;row)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.200">setRowFilter</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;row)</pre>
 <div class="block">sets the region by which output will be filtered</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -552,7 +565,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>beginPersistentOutput</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.204">beginPersistentOutput</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.208">beginPersistentOutput</a>()</pre>
 <div class="block">enables output as a single, persistent list. at present, only relevant in
  the case of JSON output.</div>
 </li>
@@ -563,7 +576,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>endPersistentOutput</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.217">endPersistentOutput</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.221">endPersistentOutput</a>()</pre>
 <div class="block">ends output of a single, persistent list. at present, only relevant in the
  case of JSON output.</div>
 </li>
@@ -574,7 +587,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>processFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.237">processFile</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.241">processFile</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                         org.apache.hadoop.fs.Path&nbsp;p)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">reads a log file and outputs its contents, one transaction at a time, as
@@ -595,7 +608,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>toStringMap</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.331">toStringMap</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.335">toStringMap</a>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
 </li>
 </ul>
 <a name="main-java.lang.String:A-">
@@ -604,7 +617,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.355">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.359">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -618,7 +631,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.368">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALPrettyPrinter.html#line.372">run</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Pass one or more log file names and formatting options and it will dump out
  a text version of the contents on <code>stdout</code>.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
index e424b37..a9f55da 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1644">WALSplitter.BoundedLogWriterCreationOutputSink</a>
+<pre>class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1646">WALSplitter.BoundedLogWriterCreationOutputSink</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.LogRecoveredEditsOutputSink</a></pre>
 </li>
 </ul>
@@ -261,7 +261,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockListLast">
 <li class="blockList">
 <h4>regionRecoverStatMap</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1646">regionRecoverStatMap</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true" title="class or interface in java.util.concurrent">ConcurrentHashMap</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1648">regionRecoverStatMap</a></pre>
 </li>
 </ul>
 </li>
@@ -278,7 +278,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BoundedLogWriterCreationOutputSink</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1648">BoundedLogWriterCreationOutputSink</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.PipelineController</a>&nbsp;controller,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1650">BoundedLogWriterCreationOutputSink</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.PipelineController</a>&nbsp;controller,
                                           <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.EntryBuffers</a>&nbsp;entryBuffers,
                                           int&nbsp;numWriters)</pre>
 </li>
@@ -297,7 +297,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockList">
 <li class="blockList">
 <h4>finishWritingAndClose</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1654">finishWritingAndClose</a>()
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1656">finishWritingAndClose</a>()
                                                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -315,7 +315,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockList">
 <li class="blockList">
 <h4>executeCloseTask</h4>
-<pre>boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1669">executeCloseTask</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletionService.html?is-external=true" title="class or interface in java.util.concurrent">CompletionService</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang">Void</a>&gt;&nbsp;completionService,
+<pre>boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1671">executeCloseTask</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletionService.html?is-external=true" title="class or interface in java.util.concurrent">CompletionService</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang">Void</a>&gt;&nbsp;completionService,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>&gt;&nbsp;thrown,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;paths)
                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a>,
@@ -341,7 +341,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputCounts</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1702">getOutputCounts</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1704">getOutputCounts</a>()</pre>
 <div class="block">since the splitting process may create multiple output files, we need a map
  regionRecoverStatMap to track the output count of each region.</div>
 <dl>
@@ -358,7 +358,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumberOfRecoveredRegions</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1714">getNumberOfRecoveredRegions</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1716">getNumberOfRecoveredRegions</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#getNumberOfRecoveredRegions--">getNumberOfRecoveredRegions</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.LogRecoveredEditsOutputSink</a></code></dd>
@@ -373,7 +373,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1724">append</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1726">append</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Append the buffer to a new recovered edits file, then close it after all done</div>
 <dl>
@@ -392,7 +392,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.LogRecov
 <ul class="blockListLast">
 <li class="blockList">
 <h4>writeThenClose</h4>
-<pre>private&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1728">writeThenClose</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
+<pre>private&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html#line.1730">writeThenClose</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
                                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
index 0437437..b250046 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
@@ -121,7 +121,7 @@
 </dl>
 <hr>
 <br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1791">WALSplitter.CorruptedLogFileException</a>
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1793">WALSplitter.CorruptedLogFileException</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 </li>
 </ul>
@@ -205,7 +205,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <ul class="blockListLast">
 <li class="blockList">
 <h4>serialVersionUID</h4>
-<pre>private static final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html#line.1792">serialVersionUID</a></pre>
+<pre>private static final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html#line.1794">serialVersionUID</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.wal.WALSplitter.CorruptedLogFileException.serialVersionUID">Constant Field Values</a></dd>
@@ -226,7 +226,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.h
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CorruptedLogFileException</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html#line.1794">CorruptedLogFileException</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html#line.1796">CorruptedLogFileException</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 </li>
 </ul>
 </li>


[29/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.CellWritableComparator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.CellWritableComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.CellWritableComparator.html
index 39170f0..7859ebc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.CellWritableComparator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.CellWritableComparable.CellWritableComparator.html
@@ -230,564 +230,567 @@
 <span class="sourceLineNo">222</span>          }<a name="line.222"></a>
 <span class="sourceLineNo">223</span>        }<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      } catch (InterruptedException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        e.printStackTrace();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      }<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>    @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    public void setup(Context context) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      int reduceNum = context.getNumReduceTasks();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Configuration conf = context.getConfiguration();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (startKeys.length != reduceNum) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          throw new IOException("Region split after job initialization");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        CellWritableComparable[] startKeyWraps =<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>          startKeyWraps[i - 1] =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * A mapper that just writes out KeyValues.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      justification="Writables are going away and this has been this way forever")<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Filter filter;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>     * @param row  The current table row key.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>     * @param value  The columns.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>     * @param context  The current context.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>     * @throws IOException When something is broken with the data.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      Context context)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        if (LOG.isTraceEnabled()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>          LOG.trace("Considering the row."<a name="line.275"></a>
-<span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            // skip if we filtered it out<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            if (kv == null) continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        e.printStackTrace();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void setup(Context context) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * Write table content out to files in hdfs.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    private List&lt;UUID&gt; clusterIds;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    private Filter filter;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     * @param value  The columns.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param context  The current context.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @throws IOException When something is broken with the data.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Context context)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        writeResult(row, value, context);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } catch (InterruptedException e) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        e.printStackTrace();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    throws IOException, InterruptedException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Put put = null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Delete delete = null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      if (LOG.isTraceEnabled()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        LOG.trace("Considering the row."<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        Delete delete) throws IOException, InterruptedException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (Cell kv : result.rawCells()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        kv = filterKv(filter, kv);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // skip if we filter it out<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        if (kv == null) continue;<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>        kv = convertKv(kv, cfRenameMap);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        // Deletes and Puts are gathered and written when finished<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>            deleteFamily.setDurability(durability);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          context.write(key, deleteFamily);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>          if (delete == null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            delete = new Delete(key.get());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          delete.add(kv);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        } else {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>          if (put == null) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>            put = new Put(key.get());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        if (durability != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          put.setDurability(durability);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        put.setClusterIds(clusterIds);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        context.write(key, put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      if (delete != null) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if (durability != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          delete.setDurability(durability);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        delete.setClusterIds(clusterIds);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        context.write(key, delete);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      put.add(kv);<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>    @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    public void setup(Context context) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Configuration conf = context.getConfiguration();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      filter = instantiateFilter(conf);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      if(durabilityStr != null){<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        LOG.info("setting WAL durability to " + durability);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        LOG.info("setting WAL durability to default.");<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      ZKWatcher zkw = null;<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Exception ex = null;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      try {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      } catch (ZooKeeperConnectionException e) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        ex = e;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      } catch (KeeperException e) {<a name="line.419"></a>
+<span class="sourceLineNo">225</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        Thread.currentThread().interrupt();<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><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setup(Context context) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      int reduceNum = context.getNumReduceTasks();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      Configuration conf = context.getConfiguration();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      TableName tableName = TableName.valueOf(context.getConfiguration().get(TABLE_NAME));<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        byte[][] startKeys = regionLocator.getStartKeys();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (startKeys.length != reduceNum) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          throw new IOException("Region split after job initialization");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        CellWritableComparable[] startKeyWraps =<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            new CellWritableComparable[startKeys.length - 1];<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        for (int i = 1; i &lt; startKeys.length; ++i) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          startKeyWraps[i - 1] =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              new CellWritableComparable(KeyValueUtil.createFirstOnRow(startKeys[i]));<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        CellWritableComparablePartitioner.START_KEYS = startKeyWraps;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * A mapper that just writes out KeyValues.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      justification="Writables are going away and this has been this way forever")<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static class CellImporter extends TableMapper&lt;ImmutableBytesWritable, Cell&gt; {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    private Filter filter;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    private static final Logger LOG = LoggerFactory.getLogger(CellImporter.class);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>     * @param row  The current table row key.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>     * @param value  The columns.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * @param context  The current context.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * @throws IOException When something is broken with the data.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      Context context)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>          LOG.trace("Considering the row."<a name="line.276"></a>
+<span class="sourceLineNo">277</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        if (filter == null<a name="line.279"></a>
+<span class="sourceLineNo">280</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.280"></a>
+<span class="sourceLineNo">281</span>                (short) row.getLength()))) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>          for (Cell kv : value.rawCells()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            kv = filterKv(filter, kv);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>            // skip if we filtered it out<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (kv == null) continue;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            context.write(row, new MapReduceExtendedCell(convertKv(kv, cfRenameMap)));<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>      } catch (InterruptedException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        LOG.error("Interrupted while emitting Cell", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        Thread.currentThread().interrupt();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void setup(Context context) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      cfRenameMap = createCfRenameMap(context.getConfiguration());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      filter = instantiateFilter(context.getConfiguration());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   * Write table content out to files in hdfs.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static class Importer extends TableMapper&lt;ImmutableBytesWritable, Mutation&gt; {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    private List&lt;UUID&gt; clusterIds;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    private Filter filter;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    private Durability durability;<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>     * @param row  The current table row key.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @param value  The columns.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param context  The current context.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @throws IOException When something is broken with the data.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      Context context)<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    throws IOException {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      try {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        writeResult(row, value, context);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } catch (InterruptedException e) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        LOG.error("Interrupted while writing result", e);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        Thread.currentThread().interrupt();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    private void writeResult(ImmutableBytesWritable key, Result result, Context context)<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    throws IOException, InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Put put = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      Delete delete = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        LOG.trace("Considering the row."<a name="line.334"></a>
+<span class="sourceLineNo">335</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (filter == null<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              (short) key.getLength()))) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        processKV(key, result, context, put, delete);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        Delete delete) throws IOException, InterruptedException {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      for (Cell kv : result.rawCells()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        kv = filterKv(filter, kv);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // skip if we filter it out<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        if (kv == null) continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        kv = convertKv(kv, cfRenameMap);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // Deletes and Puts are gathered and written when finished<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * If there are sequence of mutations and tombstones in an Export, and after Import the same<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         * sequence should be restored as it is. If we combine all Delete tombstones into single<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         * request then there is chance of ignoring few DeleteFamily tombstones, because if we<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         */<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          Delete deleteFamily = new Delete(key.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          deleteFamily.add(kv);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          if (durability != null) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            deleteFamily.setDurability(durability);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>          }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>          deleteFamily.setClusterIds(clusterIds);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          context.write(key, deleteFamily);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        } else if (CellUtil.isDelete(kv)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>          if (delete == null) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            delete = new Delete(key.get());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          delete.add(kv);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        } else {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (put == null) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            put = new Put(key.get());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          addPutToKv(put, kv);<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>      if (put != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        if (durability != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>          put.setDurability(durability);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        put.setClusterIds(clusterIds);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        context.write(key, put);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      if (delete != null) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        if (durability != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          delete.setDurability(durability);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        delete.setClusterIds(clusterIds);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        context.write(key, delete);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      }<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>    protected void addPutToKv(Put put, Cell kv) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      put.add(kv);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public void setup(Context context) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      LOG.info("Setting up " + getClass() + " mapper.");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Configuration conf = context.getConfiguration();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      cfRenameMap = createCfRenameMap(conf);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      filter = instantiateFilter(conf);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      String durabilityStr = conf.get(WAL_DURABILITY);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if(durabilityStr != null){<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        durability = Durability.valueOf(durabilityStr.toUpperCase(Locale.ROOT));<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        LOG.info("setting WAL durability to " + durability);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        LOG.info("setting WAL durability to default.");<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      // TODO: This is kind of ugly doing setup of ZKW just to read the clusterid.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      ZKWatcher zkw = null;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Exception ex = null;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      try {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        zkw = new ZKWatcher(conf, context.getTaskAttemptID().toString(), null);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        clusterIds = Collections.singletonList(ZKClusterId.getUUIDForCluster(zkw));<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      } catch (ZooKeeperConnectionException e) {<a name="line.419"></a>
 <span class="sourceLineNo">420</span>        ex = e;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      } catch (IOException e) {<a name="line.422"></a>
+<span class="sourceLineNo">421</span>        LOG.error("Problem connecting to ZooKeper during task setup", e);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      } catch (KeeperException e) {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        ex = e;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        LOG.error("Problem setting up task", e);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } finally {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        if (zkw != null) zkw.close();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (clusterIds == null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // exit early if setup fails<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        throw new RuntimeException(ex);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * optionally not include in the job output<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    // get the filter, if it was configured<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (filterClass == null) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IllegalAccessException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      throw new RuntimeException(e);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    } catch (SecurityException e) {<a name="line.458"></a>
+<span class="sourceLineNo">424</span>        LOG.error("Problem reading ZooKeeper data during task setup", e);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      } catch (IOException e) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        ex = e;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        LOG.error("Problem setting up task", e);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      } finally {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (zkw != null) zkw.close();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      }<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      if (clusterIds == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // exit early if setup fails<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        throw new RuntimeException(ex);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Create a {@link Filter} to apply to all incoming keys ({@link KeyValue KeyValues}) to<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * optionally not include in the job output<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param conf {@link Configuration} from which to load the filter<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @return the filter to use for the task, or &lt;tt&gt;null&lt;/tt&gt; if no filter to should be used<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @throws IllegalArgumentException if the filter is misconfigured<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  public static Filter instantiateFilter(Configuration conf) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    // get the filter, if it was configured<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    Class&lt;? extends Filter&gt; filterClass = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (filterClass == null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      LOG.debug("No configured filter class, accepting all keyvalues.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return null;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    LOG.debug("Attempting to create filter:" + filterClass);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    String[] filterArgs = conf.getStrings(FILTER_ARGS_CONF_KEY);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ArrayList&lt;byte[]&gt; quotedArgs = toQuotedByteArrays(filterArgs);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    try {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      Method m = filterClass.getMethod("createFilterFromArguments", ArrayList.class);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return (Filter) m.invoke(null, quotedArgs);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    } catch (IllegalAccessException e) {<a name="line.458"></a>
 <span class="sourceLineNo">459</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.459"></a>
 <span class="sourceLineNo">460</span>      throw new RuntimeException(e);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    } catch (NoSuchMethodException e) {<a name="line.461"></a>
+<span class="sourceLineNo">461</span>    } catch (SecurityException e) {<a name="line.461"></a>
 <span class="sourceLineNo">462</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.462"></a>
 <span class="sourceLineNo">463</span>      throw new RuntimeException(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IllegalArgumentException e) {<a name="line.464"></a>
+<span class="sourceLineNo">464</span>    } catch (NoSuchMethodException e) {<a name="line.464"></a>
 <span class="sourceLineNo">465</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.465"></a>
 <span class="sourceLineNo">466</span>      throw new RuntimeException(e);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    } catch (InvocationTargetException e) {<a name="line.467"></a>
+<span class="sourceLineNo">467</span>    } catch (IllegalArgumentException e) {<a name="line.467"></a>
 <span class="sourceLineNo">468</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.468"></a>
 <span class="sourceLineNo">469</span>      throw new RuntimeException(e);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    for (String stringArg : stringArgs) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return quotedArgs;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * Attempt to filter out the keyvalue<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param c {@link Cell} on which to apply the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   *         {@link Cell}<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    if (filter != null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (LOG.isTraceEnabled()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      // if its not an accept type, then skip this kv<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        return null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return c;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  // helper: create a new KeyValue based on CF rename map<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if(cfRenameMap != null) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (newCfName != null) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.511"></a>
-<span class="sourceLineNo">512</span>            kv.getRowOffset(),              // row offset<a name="line.512"></a>
-<span class="sourceLineNo">513</span>            kv.getRowLength(),              // row length<a name="line.513"></a>
-<span class="sourceLineNo">514</span>            newCfName,                      // CF buffer<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            0,                              // CF offset<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            newCfName.length,               // CF length<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            kv.getQualifierLength(),        // qualifier length<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            kv.getTimestamp(),              // timestamp<a name="line.520"></a>
-<span class="sourceLineNo">521</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            kv.getValueArray(),             // value buffer<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            kv.getValueOffset(),            // value offset<a name="line.523"></a>
-<span class="sourceLineNo">524</span>            kv.getValueLength());           // value length<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>    return kv;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.530"></a>
-<span class="sourceLineNo">531</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if(allMappingsPropVal != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      for (String mapping: allMappings) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if(cfRenameMap == null) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        String [] srcAndDest = mapping.split(":");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        if(srcAndDest.length != 2) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            continue;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    return cfRenameMap;<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>  /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.552"></a>
-<span class="sourceLineNo">553</span>   * the mapper how to rename column families.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   *<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * the mapper behavior.<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   *<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   *  set<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  static public void configureCfRenaming(Configuration conf,<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          Map&lt;String, String&gt; renameMap) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    StringBuilder sb = new StringBuilder();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      String sourceCf = entry.getKey();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String destCf = entry.getValue();<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.571"></a>
-<span class="sourceLineNo">572</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              + sourceCf + ", " + destCf);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>      if(sb.length() != 0) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        sb.append(",");<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      sb.append(sourceCf + ":" + destCf);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    conf.set(CF_RENAME_PROP, sb.toString());<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Add a Filter to be instantiated on import<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @param conf Configuration to update (will be passed to the job)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @param clazz {@link Filter} subclass to instantiate on the server.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param filterArgs List of arguments to pass to the filter on instantiation<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   */<a name="line.590"></a>
-<span class="sourceLineNo">591</span>  public static void addFilterAndArguments(Configuration conf, Class&lt;? extends Filter&gt; clazz,<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      List&lt;String&gt; filterArgs) throws IOException {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    conf.set(Import.FILTER_CLASS_CONF_KEY, clazz.getName());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    conf.setStrings(Import.FILTER_ARGS_CONF_KEY, filterArgs.toArray(new String[filterArgs.size()]));<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>  /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * Sets up the actual job.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @param conf The current configuration.<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @param args The command line parameters.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * @return The newly created job.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @throws IOException When setting up the job fails.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   */<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  public static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    TableName tableName = TableName.valueOf(args[0]);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    conf.set(TABLE_NAME, tableName.getNameAsString());<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    Path inputDir = new Path(args[1]);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    job.setJarByClass(Importer.class);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    FileInputFormat.setInputPaths(job, inputDir);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    job.setInputFormatClass(SequenceFileInputFormat.class);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>    // make sure we get the filter in the jars<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      Class&lt;? extends Filter&gt; filter = conf.getClass(FILTER_CLASS_CONF_KEY, null, Filter.class);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (filter != null) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        TableMapReduceUtil.addDependencyJarsForClasses(conf, filter);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } catch (Exception e) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      throw new IOException(e);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>    if (hfileOutPath != null &amp;&amp; conf.getBoolean(HAS_LARGE_RESULT, false)) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      LOG.info("Use Large Result!!");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>          Table table = conn.getTable(tableName);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        job.setMapperClass(CellSortImporter.class);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        job.setReducerClass(CellReducer.class);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        Path outputDir = new Path(hfileOutPath);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        job.setMapOutputKeyClass(CellWritableComparable.class);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        job.getConfiguration().setClass("mapreduce.job.output.key.comparator.class",<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            CellWritableComparable.CellWritableComparator.class,<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            RawComparator.class);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        Path partitionsPath =<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            new Path(TotalOrderPartitioner.getPartitionFile(job.getConfiguration()));<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        FileSystem fs = FileSystem.get(job.getConfiguration());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        fs.deleteOnExit(partitionsPath);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        job.setPartitionerClass(CellWritableComparablePartitioner.class);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        job.setNumReduceTasks(regionLocator.getStartKeys().length);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (hfileOutPath != null) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      LOG.info("writing to hfiles for bulk load.");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      job.setMapperClass(CellImporter.class);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          Table table = conn.getTable(tableName);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>          RegionLocator regionLocator = conn.getRegionLocator(tableName)){<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        job.setReducerClass(CellSortReducer.class);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        Path outputDir = new Path(hfileOutPath);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        FileOutputFormat.setOutputPath(job, outputDir);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        job.setMapOutputValueClass(MapReduceExtendedCell.class);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), regionLocator);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        TableMapReduceUtil.addDependencyJarsForClasses(job.getConfiguration(),<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            org.apache.hbase.thirdparty.com.google.common.base.Preconditions.class);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    } else {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      LOG.info("writing directly to table from Mapper.");<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      // No reducers.  Just write straight to table.  Call initTableReducerJob<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      // because it sets up the TableOutputFormat.<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      job.setMapperClass(Importer.class);<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      job.setNumReduceTasks(0);<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    return job;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /*<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param errorMsg Error message.  Can be null.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  private static void usage(final String errorMsg) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    if (errorMsg != null &amp;&amp; errorMsg.length() &gt; 0) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      System.err.println("ERROR: " + errorMsg);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    System.err.println("Usage: Import [options] &lt;tablename&gt; &lt;inputdir&gt;");<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    System.err.println("By default Import will load data directly into HBase. To instead generate");<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    System.err.println("HFiles of data to prepare for a bulk data load, pass the option:");<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    System.err.println("  -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    System.err.println("If there is a large result that includes too much Cell "<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        + "whitch can occur OOME caused by the memery sort in reducer, pass the option:");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    System.err.println("  -D" + HAS_LARGE_RESULT + "=true");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    System.err<a name="line.689"></a>
-<span class="sourceLineNo">690</span>        .println(" To apply a generic org.apache.hadoop.hbase.filter.Filter to the input, use");<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    System.err.println("  -D" + FILTER_CLASS_CONF_KEY + "=&lt;name of filter class&gt;");<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    System.err.println("  -D" + FILTER_ARGS_CONF_KEY + "=&lt;comma separated list of args for filter");<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    System.err.println(" NOTE: The filter will be applied BEFORE doing key renames via the "<a name="line.693"></a>
-<span class="sourceLineNo">694</span>        + CF_RENAME_PROP + " property. Futher, filters will only use the"<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        + " Filter#filterRowKey(byte[] buffer, int offset, int length) method to identify "<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        + " whether the current row needs to be ignored completely for processing and "<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        + " Filter#filterCell(Cell) method to determine if the Cell should be added;"<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        + " the Cell.");<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    System.err.println("To import data exported from HBase 0.94, use");<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    System.err.println("  -Dhbase.import.version=0.94");<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    System.err.println("  -D " + JOB_NAME_CONF_KEY<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        + "=jobName - use the specified mapreduce job name for the import");<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    System.err.println("For performance consider the following options:\n"<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        + "  -Dmapreduce.map.speculative=false\n"<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        + "  -Dmapreduce.reduce.speculative=false\n"<a name="line.706"></a>
-<span class="sourceLineNo">707</span>        + "  -D" + WAL_DURABILITY + "=&lt;Used while writing data to hbase."<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            +" Allowed values are the supported durability values"<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            +" like SKIP_WAL/ASYNC_WAL/SYNC_WAL/...&gt;");<a name="line.709"></a>
-<span class="sourceLineNo">710</span>  }<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  /**<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   * If the durability is set to {@link Durability#SKIP_WAL} and the data is imported to hbase, we<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * need to flush all the regions of the table as the data is held in memory and is also not<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   * present in the Write Ahead Log to replay in scenarios of a crash. This method flushes all the<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   * regions of the table in the scenarios of import data to hbase with {@link Durability#SKIP_WAL}<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public static void flushRegionsIfNecessary(Configuration conf) throws IOException,<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      InterruptedException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    String tableName = conf.get(TABLE_NAME);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    Admin hAdmin = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    Connection connection = null;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    String durability = conf.get(WAL_DURABILITY);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    // Need to flush if the data is written to hbase and skip wal is enabled.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    if (conf.get(BULK_OUTPUT_CONF_KEY) == null &amp;&amp; durability != null<a name="line.725"></a>
-<span class="sourceLineNo">726</span>        &amp;&amp; Durability.SKIP_WAL.name().equalsIgnoreCase(durability)) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      LOG.info("Flushing all data that skipped the WAL.");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>        connection = ConnectionFactory.createConnection(conf);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        hAdmin = connection.getAdmin();<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        hAdmin.flush(TableName.valueOf(tableName));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      } finally {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>        if (hAdmin != null) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>          hAdmin.close();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        if (connection != null) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          connection.close();<a name="line.737"></a>
+<span class="sourceLineNo">470</span>    } catch (InvocationTargetException e) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      LOG.error("Couldn't instantiate filter!", e);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new RuntimeException(e);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  private static ArrayList&lt;byte[]&gt; toQuotedByteArrays(String... stringArgs) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ArrayList&lt;byte[]&gt; quotedArgs = new ArrayList&lt;&gt;();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    for (String stringArg : stringArgs) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      // all the filters' instantiation methods expected quoted args since they are coming from<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      // the shell, so add them here, though it shouldn't really be needed :-/<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      quotedArgs.add(Bytes.toBytes("'" + stringArg + "'"));<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return quotedArgs;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  /**<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Attempt to filter out the keyvalue<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   * @param c {@link Cell} on which to apply the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   * @return &lt;tt&gt;null&lt;/tt&gt; if the key should not be written, otherwise returns the original<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   *         {@link Cell}<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   */<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  public static Cell filterKv(Filter filter, Cell c) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    // apply the filter and skip this kv if the filter doesn't apply<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (filter != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      Filter.ReturnCode code = filter.filterCell(c);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      if (LOG.isTraceEnabled()) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        LOG.trace("Filter returned:" + code + " for the cell:" + c);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      // if its not an accept type, then skip this kv<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (!(code.equals(Filter.ReturnCode.INCLUDE) || code<a name="line.500"></a>
+<span class="sourceLineNo">501</span>          .equals(Filter.ReturnCode.INCLUDE_AND_NEXT_COL))) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        return null;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return c;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  // helper: create a new KeyValue based on CF rename map<a name="line.508"></a>
+<span class="sourceLineNo">509</span>  private static Cell convertKv(Cell kv, Map&lt;byte[], byte[]&gt; cfRenameMap) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    if(cfRenameMap != null) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // If there's a rename mapping for this CF, create a new KeyValue<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      byte[] newCfName = cfRenameMap.get(CellUtil.cloneFamily(kv));<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      if (newCfName != null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        kv = new KeyValue(kv.getRowArray(), // row buffer<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            kv.getRowOffset(),              // row offset<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            kv.getRowLength(),              // row length<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            newCfName,                      // CF buffer<a name="line.517"></a>
+<span class="sourceLineNo">518</span>            0,                              // CF offset<a name="line.518"></a>
+<span class="sourceLineNo">519</span>            newCfName.length,               // CF length<a name="line.519"></a>
+<span class="sourceLineNo">520</span>            kv.getQualifierArray(),         // qualifier buffer<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            kv.getQualifierOffset(),        // qualifier offset<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            kv.getQualifierLength(),        // qualifier length<a name="line.522"></a>
+<span class="sourceLineNo">523</span>            kv.getTimestamp(),              // timestamp<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            KeyValue.Type.codeToType(kv.getTypeByte()), // KV Type<a name="line.524"></a>
+<span class="sourceLineNo">525</span>            kv.getValueArray(),             // value buffer<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            kv.getValueOffset(),            // value offset<a name="line.526"></a>
+<span class="sourceLineNo">527</span>            kv.getValueLength());           // value length<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return kv;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  // helper: make a map from sourceCfName to destCfName by parsing a config key<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  private static Map&lt;byte[], byte[]&gt; createCfRenameMap(Configuration conf) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Map&lt;byte[], byte[]&gt; cfRenameMap = null;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String allMappingsPropVal = conf.get(CF_RENAME_PROP);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    if(allMappingsPropVal != null) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      // The conf value format should be sourceCf1:destCf1,sourceCf2:destCf2,...<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      String[] allMappings = allMappingsPropVal.split(",");<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      for (String mapping: allMappings) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        if(cfRenameMap == null) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            cfRenameMap = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        String [] srcAndDest = mapping.split(":");<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        if(srcAndDest.length != 2) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>            continue;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        cfRenameMap.put(srcAndDest[0].getBytes(), srcAndDest[1].getBytes());<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>    return cfRenameMap;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>  /**<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   * &lt;p&gt;Sets a configuration property with key {@link #CF_RENAME_PROP} in conf that tells<a name="line.555"></a>
+<span class="sourceLineNo">556</span>   * the mapper how to rename column families.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   *<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * &lt;p&gt;Alternately, instead of calling this function, you could set the configuration key<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   * {@link #CF_RENAME_PROP} yourself. The value should look like<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   * &lt;pre&gt;srcCf1:destCf1,srcCf2:destCf2,....&lt;/pre&gt;. This would have the same effect on<a name="line.560"></a>
+<span class="sourceLineNo">561</span>   * the mapper behavior.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   *<a name="line.562"></a>
+<span class="sourceLineNo">563</span>   * @param conf the Configuration in which the {@link #CF_RENAME_PROP} key will be<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   *  set<a name="line.564"></a>
+<span class="sourceLineNo">565</span>   * @param renameMap a mapping from source CF names to destination CF names<a name="line.565"></a>
+<span class="sourceLineNo">566</span>   */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>  static public void configureCfRenaming(Configuration conf,<a name="line.567"></a>
+<span class="sourceLineNo">568</span>          Map&lt;String, String&gt; renameMap) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    StringBuilder sb = new StringBuilder();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    for(Map.Entry&lt;String,String&gt; entry: renameMap.entrySet()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      String sourceCf = entry.getKey();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      String destCf = entry.getValue();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      if(sourceCf.contains(":") || sourceCf.contains(",") ||<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              destCf.contains(":") || destCf.contains(",")) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        throw new IllegalArgumentException("Illegal character in CF names: "<a name="line.576"></a>
+<span class="sourceLineNo">577</span>              + sourceCf + ", " + destCf);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>      if(sb.length() != 0) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        sb.append(",");<a name="line.581"></a>
+<span

<TRUNCATED>

[36/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html b/devapidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
index d98b2a6..8fc079d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
@@ -252,660 +252,661 @@
 <span class="sourceLineNo">244</span>    throws CharacterCodingException {<a name="line.244"></a>
 <span class="sourceLineNo">245</span><a name="line.245"></a>
 <span class="sourceLineNo">246</span>    String filterName = Bytes.toString(getFilterName(filterStringAsByteArray));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    ArrayList&lt;byte []&gt; filterArguments = getFilterArguments(filterStringAsByteArray);<a name="line.247"></a>
+<span class="sourceLineNo">247</span>    ArrayList&lt;byte[]&gt; filterArguments = getFilterArguments(filterStringAsByteArray);<a name="line.247"></a>
 <span class="sourceLineNo">248</span>    if (!filterHashMap.containsKey(filterName)) {<a name="line.248"></a>
 <span class="sourceLineNo">249</span>      throw new IllegalArgumentException("Filter Name " + filterName + " not supported");<a name="line.249"></a>
 <span class="sourceLineNo">250</span>    }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    try {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      filterName = filterHashMap.get(filterName);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      Class&lt;?&gt; c = Class.forName(filterName);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      Class&lt;?&gt;[] argTypes = new Class [] {ArrayList.class};<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      Method m = c.getDeclaredMethod("createFilterFromArguments", argTypes);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return (Filter) m.invoke(null,filterArguments);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    } catch (ClassNotFoundException e) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      e.printStackTrace();<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    } catch (NoSuchMethodException e) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      e.printStackTrace();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    } catch (IllegalAccessException e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      e.printStackTrace();<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    } catch (InvocationTargetException e) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      e.printStackTrace();<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    throw new IllegalArgumentException("Incorrect filter string " +<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        new String(filterStringAsByteArray, StandardCharsets.UTF_8));<a name="line.267"></a>
-<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>/**<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * Returns the filter name given a simple filter expression<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * &lt;p&gt;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * @param filterStringAsByteArray a simple filter expression<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * @return name of filter in the simple filter expression<a name="line.274"></a>
-<span class="sourceLineNo">275</span> */<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public static byte [] getFilterName (byte [] filterStringAsByteArray) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    int filterNameStartIndex = 0;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    int filterNameEndIndex = 0;<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    for (int i=filterNameStartIndex; i&lt;filterStringAsByteArray.length; i++) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      if (filterStringAsByteArray[i] == ParseConstants.LPAREN ||<a name="line.281"></a>
-<span class="sourceLineNo">282</span>          filterStringAsByteArray[i] == ParseConstants.WHITESPACE) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        filterNameEndIndex = i;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        break;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      }<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    if (filterNameEndIndex == 0) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      throw new IllegalArgumentException("Incorrect Filter Name");<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>    byte [] filterName = new byte[filterNameEndIndex - filterNameStartIndex];<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    Bytes.putBytes(filterName, 0, filterStringAsByteArray, 0,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>                   filterNameEndIndex - filterNameStartIndex);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    return filterName;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>/**<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * Returns the arguments of the filter from the filter string<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * &lt;p&gt;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * @param filterStringAsByteArray filter string given by the user<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @return an ArrayList containing the arguments of the filter in the filter string<a name="line.302"></a>
-<span class="sourceLineNo">303</span> */<a name="line.303"></a>
-<span class="sourceLineNo">304</span>  public static ArrayList&lt;byte []&gt; getFilterArguments (byte [] filterStringAsByteArray) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    int argumentListStartIndex = Bytes.searchDelimiterIndex(filterStringAsByteArray, 0,<a name="line.305"></a>
-<span class="sourceLineNo">306</span>                                                       filterStringAsByteArray.length,<a name="line.306"></a>
-<span class="sourceLineNo">307</span>                                                       ParseConstants.LPAREN);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    if (argumentListStartIndex == -1) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      throw new IllegalArgumentException("Incorrect argument list");<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>    int argumentStartIndex = 0;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    int argumentEndIndex = 0;<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    ArrayList&lt;byte []&gt; filterArguments = new ArrayList&lt;&gt;();<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>    for (int i = argumentListStartIndex + 1; i&lt;filterStringAsByteArray.length; i++) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>      if (filterStringAsByteArray[i] == ParseConstants.WHITESPACE ||<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          filterStringAsByteArray[i] == ParseConstants.COMMA ||<a name="line.319"></a>
-<span class="sourceLineNo">320</span>          filterStringAsByteArray[i] == ParseConstants.RPAREN) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        continue;<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>      // The argument is in single quotes - for example 'prefix'<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        argumentStartIndex = i;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>        for (int j = argumentStartIndex+1; j &lt; filterStringAsByteArray.length; j++) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>          if (filterStringAsByteArray[j] == ParseConstants.SINGLE_QUOTE) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>            if (isQuoteUnescaped(filterStringAsByteArray,j)) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>              argumentEndIndex = j;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>              i = j+1;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>              byte [] filterArgument = createUnescapdArgument(filterStringAsByteArray,<a name="line.332"></a>
-<span class="sourceLineNo">333</span>                                                              argumentStartIndex, argumentEndIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>              filterArguments.add(filterArgument);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>              break;<a name="line.335"></a>
-<span class="sourceLineNo">336</span>            } else {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>              // To jump over the second escaped quote<a name="line.337"></a>
-<span class="sourceLineNo">338</span>              j++;<a name="line.338"></a>
-<span class="sourceLineNo">339</span>            }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>            throw new IllegalArgumentException("Incorrect argument list");<a name="line.341"></a>
-<span class="sourceLineNo">342</span>          }<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        }<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      } else {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        // The argument is an integer, boolean, comparison operator like &lt;, &gt;, != etc<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        argumentStartIndex = i;<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        for (int j = argumentStartIndex; j &lt; filterStringAsByteArray.length; j++) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>          if (filterStringAsByteArray[j] == ParseConstants.WHITESPACE ||<a name="line.348"></a>
-<span class="sourceLineNo">349</span>              filterStringAsByteArray[j] == ParseConstants.COMMA ||<a name="line.349"></a>
-<span class="sourceLineNo">350</span>              filterStringAsByteArray[j] == ParseConstants.RPAREN) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>            argumentEndIndex = j - 1;<a name="line.351"></a>
-<span class="sourceLineNo">352</span>            i = j;<a name="line.352"></a>
-<span class="sourceLineNo">353</span>            byte [] filterArgument = new byte [argumentEndIndex - argumentStartIndex + 1];<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            Bytes.putBytes(filterArgument, 0, filterStringAsByteArray,<a name="line.354"></a>
-<span class="sourceLineNo">355</span>                           argumentStartIndex, argumentEndIndex - argumentStartIndex + 1);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            filterArguments.add(filterArgument);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            break;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>            throw new IllegalArgumentException("Incorrect argument list");<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>    }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    return filterArguments;<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>/**<a name="line.367"></a>
-<span class="sourceLineNo">368</span> * This function is called while parsing the filterString and an operator is parsed<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * &lt;p&gt;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * @param operatorStack the stack containing the operators and parenthesis<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * @param filterStack the stack containing the filters<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @param operator the operator found while parsing the filterString<a name="line.372"></a>
-<span class="sourceLineNo">373</span> */<a name="line.373"></a>
-<span class="sourceLineNo">374</span>  public void reduce(Stack&lt;ByteBuffer&gt; operatorStack,<a name="line.374"></a>
-<span class="sourceLineNo">375</span>                     Stack&lt;Filter&gt; filterStack,<a name="line.375"></a>
-<span class="sourceLineNo">376</span>                     ByteBuffer operator) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    while (!operatorStack.empty() &amp;&amp;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>           !(ParseConstants.LPAREN_BUFFER.equals(operatorStack.peek())) &amp;&amp;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>           hasHigherPriority(operatorStack.peek(), operator)) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      filterStack.push(popArguments(operatorStack, filterStack));<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    }<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>  /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Pops an argument from the operator stack and the number of arguments required by the operator<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * from the filterStack and evaluates them<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * &lt;p&gt;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * @param operatorStack the stack containing the operators<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @param filterStack the stack containing the filters<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   * @return the evaluated filter<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   */<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  public static Filter popArguments (Stack&lt;ByteBuffer&gt; operatorStack, Stack &lt;Filter&gt; filterStack) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    ByteBuffer argumentOnTopOfStack = operatorStack.peek();<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span>    if (argumentOnTopOfStack.equals(ParseConstants.OR_BUFFER)) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      // The top of the stack is an OR<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      try {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.OR_BUFFER)) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>          Filter filter = filterStack.pop();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          listOfFilters.add(0, filter);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          operatorStack.pop();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        }<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        Filter filter = filterStack.pop();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        listOfFilters.add(0, filter);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        Filter orFilter = new FilterList(FilterList.Operator.MUST_PASS_ONE, listOfFilters);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        return orFilter;<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      } catch (EmptyStackException e) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        throw new IllegalArgumentException("Incorrect input string - an OR needs two filters");<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.AND_BUFFER)) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      // The top of the stack is an AND<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      try {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.AND_BUFFER)) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>          Filter filter = filterStack.pop();<a name="line.417"></a>
-<span class="sourceLineNo">418</span>          listOfFilters.add(0, filter);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>          operatorStack.pop();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        Filter filter = filterStack.pop();<a name="line.421"></a>
-<span class="sourceLineNo">422</span>        listOfFilters.add(0, filter);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>        Filter andFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL, listOfFilters);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        return andFilter;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      } catch (EmptyStackException e) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        throw new IllegalArgumentException("Incorrect input string - an AND needs two filters");<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.SKIP_BUFFER)) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      // The top of the stack is a SKIP<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      try {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        Filter wrappedFilter = filterStack.pop();<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        Filter skipFilter = new SkipFilter(wrappedFilter);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        operatorStack.pop();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        return skipFilter;<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      } catch (EmptyStackException e) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        throw new IllegalArgumentException("Incorrect input string - a SKIP wraps a filter");<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>    } else if (argumentOnTopOfStack.equals(ParseConstants.WHILE_BUFFER)) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      // The top of the stack is a WHILE<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      try {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        Filter wrappedFilter = filterStack.pop();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        Filter whileMatchFilter = new WhileMatchFilter(wrappedFilter);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        operatorStack.pop();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        return whileMatchFilter;<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      } catch (EmptyStackException e) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        throw new IllegalArgumentException("Incorrect input string - a WHILE wraps a filter");<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.LPAREN_BUFFER)) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      // The top of the stack is a LPAREN<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      try {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        Filter filter  = filterStack.pop();<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        operatorStack.pop();<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        return filter;<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      } catch (EmptyStackException e) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>        throw new IllegalArgumentException("Incorrect Filter String");<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>    } else {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      throw new IllegalArgumentException("Incorrect arguments on operatorStack");<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    }<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span>/**<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * Returns which operator has higher precedence<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * &lt;p&gt;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * If a has higher precedence than b, it returns true<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * If they have the same precedence, it returns false<a name="line.470"></a>
-<span class="sourceLineNo">471</span> */<a name="line.471"></a>
-<span class="sourceLineNo">472</span>  public boolean hasHigherPriority(ByteBuffer a, ByteBuffer b) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    if ((operatorPrecedenceHashMap.get(a) - operatorPrecedenceHashMap.get(b)) &lt; 0) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      return true;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    }<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    return false;<a name="line.476"></a>
-<span class="sourceLineNo">477</span>  }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span>/**<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * Removes the single quote escaping a single quote - thus it returns an unescaped argument<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * &lt;p&gt;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> * @param filterStringAsByteArray filter string given by user<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @param argumentStartIndex start index of the argument<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @param argumentEndIndex end index of the argument<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return returns an unescaped argument<a name="line.485"></a>
-<span class="sourceLineNo">486</span> */<a name="line.486"></a>
-<span class="sourceLineNo">487</span>  public static byte [] createUnescapdArgument (byte [] filterStringAsByteArray,<a name="line.487"></a>
-<span class="sourceLineNo">488</span>                                                int argumentStartIndex, int argumentEndIndex) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    int unescapedArgumentLength = 2;<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      unescapedArgumentLength ++;<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.492"></a>
-<span class="sourceLineNo">493</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          filterStringAsByteArray[i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>        i++;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        continue;<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><a name="line.499"></a>
-<span class="sourceLineNo">500</span>    byte [] unescapedArgument = new byte [unescapedArgumentLength];<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    int count = 1;<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    unescapedArgument[0] = '\'';<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      if (filterStringAsByteArray [i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.504"></a>
-<span class="sourceLineNo">505</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          filterStringAsByteArray [i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>        unescapedArgument[count++] = filterStringAsByteArray [i+1];<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        i++;<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>        unescapedArgument[count++] = filterStringAsByteArray [i];<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    }<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    unescapedArgument[unescapedArgumentLength - 1] = '\'';<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    return unescapedArgument;<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>/**<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'OR'<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * &lt;p&gt;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * @param filterStringAsByteArray filter string given by the user<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * @param indexOfOr index at which an 'O' was read<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * @return true if the keyword 'OR' is at the current index<a name="line.523"></a>
-<span class="sourceLineNo">524</span> */<a name="line.524"></a>
-<span class="sourceLineNo">525</span>  public static boolean checkForOr (byte [] filterStringAsByteArray, int indexOfOr)<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    throws CharacterCodingException, ArrayIndexOutOfBoundsException {<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span>    try {<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      if (filterStringAsByteArray[indexOfOr] == ParseConstants.O &amp;&amp;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>          filterStringAsByteArray[indexOfOr+1] == ParseConstants.R &amp;&amp;<a name="line.530"></a>
-<span class="sourceLineNo">531</span>          (filterStringAsByteArray[indexOfOr-1] == ParseConstants.WHITESPACE ||<a name="line.531"></a>
-<span class="sourceLineNo">532</span>           filterStringAsByteArray[indexOfOr-1] == ParseConstants.RPAREN) &amp;&amp;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>          (filterStringAsByteArray[indexOfOr+2] == ParseConstants.WHITESPACE ||<a name="line.533"></a>
-<span class="sourceLineNo">534</span>           filterStringAsByteArray[indexOfOr+2] == ParseConstants.LPAREN)) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>        return true;<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      } else {<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        return false;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      }<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      return false;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>  }<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>/**<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'AND'<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * &lt;p&gt;<a name="line.546"></a>
-<span class="sourceLineNo">547</span> * @param filterStringAsByteArray filter string given by the user<a name="line.547"></a>
-<span class="sourceLineNo">548</span> * @param indexOfAnd index at which an 'A' was read<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * @return true if the keyword 'AND' is at the current index<a name="line.549"></a>
-<span class="sourceLineNo">550</span> */<a name="line.550"></a>
-<span class="sourceLineNo">551</span>  public static boolean checkForAnd (byte [] filterStringAsByteArray, int indexOfAnd)<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    throws CharacterCodingException {<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span>    try {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      if (filterStringAsByteArray[indexOfAnd] == ParseConstants.A &amp;&amp;<a name="line.555"></a>
-<span class="sourceLineNo">556</span>          filterStringAsByteArray[indexOfAnd+1] == ParseConstants.N &amp;&amp;<a name="line.556"></a>
-<span class="sourceLineNo">557</span>          filterStringAsByteArray[indexOfAnd+2] == ParseConstants.D &amp;&amp;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>          (filterStringAsByteArray[indexOfAnd-1] == ParseConstants.WHITESPACE ||<a name="line.558"></a>
-<span class="sourceLineNo">559</span>           filterStringAsByteArray[indexOfAnd-1] == ParseConstants.RPAREN) &amp;&amp;<a name="line.559"></a>
-<span class="sourceLineNo">560</span>          (filterStringAsByteArray[indexOfAnd+3] == ParseConstants.WHITESPACE ||<a name="line.560"></a>
-<span class="sourceLineNo">561</span>           filterStringAsByteArray[indexOfAnd+3] == ParseConstants.LPAREN)) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>        return true;<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      } else {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        return false;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      }<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      return false;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    }<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>
-<span class="sourceLineNo">572</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'SKIP'<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * &lt;p&gt;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * @param filterStringAsByteArray filter string given by the user<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * @param indexOfSkip index at which an 'S' was read<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @return true if the keyword 'SKIP' is at the current index<a name="line.576"></a>
-<span class="sourceLineNo">577</span> */<a name="line.577"></a>
-<span class="sourceLineNo">578</span>  public static boolean checkForSkip (byte [] filterStringAsByteArray, int indexOfSkip)<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    throws CharacterCodingException {<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>    try {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      if (filterStringAsByteArray[indexOfSkip] == ParseConstants.S &amp;&amp;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>          filterStringAsByteArray[indexOfSkip+1] == ParseConstants.K &amp;&amp;<a name="line.583"></a>
-<span class="sourceLineNo">584</span>          filterStringAsByteArray[indexOfSkip+2] == ParseConstants.I &amp;&amp;<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          filterStringAsByteArray[indexOfSkip+3] == ParseConstants.P &amp;&amp;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>          (indexOfSkip == 0 ||<a name="line.586"></a>
-<span class="sourceLineNo">587</span>           filterStringAsByteArray[indexOfSkip-1] == ParseConstants.WHITESPACE ||<a name="line.587"></a>
-<span class="sourceLineNo">588</span>           filterStringAsByteArray[indexOfSkip-1] == ParseConstants.RPAREN ||<a name="line.588"></a>
-<span class="sourceLineNo">589</span>           filterStringAsByteArray[indexOfSkip-1] == ParseConstants.LPAREN) &amp;&amp;<a name="line.589"></a>
-<span class="sourceLineNo">590</span>          (filterStringAsByteArray[indexOfSkip+4] == ParseConstants.WHITESPACE ||<a name="line.590"></a>
-<span class="sourceLineNo">591</span>           filterStringAsByteArray[indexOfSkip+4] == ParseConstants.LPAREN)) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        return true;<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      } else {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        return false;<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      return false;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>  }<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>/**<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'WHILE'<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * &lt;p&gt;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @param filterStringAsByteArray filter string given by the user<a name="line.604"></a>
-<span class="sourceLineNo">605</span> * @param indexOfWhile index at which an 'W' was read<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * @return true if the keyword 'WHILE' is at the current index<a name="line.606"></a>
-<span class="sourceLineNo">607</span> */<a name="line.607"></a>
-<span class="sourceLineNo">608</span>  public static boolean checkForWhile (byte [] filterStringAsByteArray, int indexOfWhile)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    throws CharacterCodingException {<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span>    try {<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      if (filterStringAsByteArray[indexOfWhile] == ParseConstants.W &amp;&amp;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>          filterStringAsByteArray[indexOfWhile+1] == ParseConstants.H &amp;&amp;<a name="line.613"></a>
-<span class="sourceLineNo">614</span>          filterStringAsByteArray[indexOfWhile+2] == ParseConstants.I &amp;&amp;<a name="line.614"></a>
-<span class="sourceLineNo">615</span>          filterStringAsByteArray[indexOfWhile+3] == ParseConstants.L &amp;&amp;<a name="line.615"></a>
-<span class="sourceLineNo">616</span>          filterStringAsByteArray[indexOfWhile+4] == ParseConstants.E &amp;&amp;<a name="line.616"></a>
-<span class="sourceLineNo">617</span>          (indexOfWhile == 0 || filterStringAsByteArray[indexOfWhile-1] == ParseConstants.WHITESPACE<a name="line.617"></a>
-<span class="sourceLineNo">618</span>           || filterStringAsByteArray[indexOfWhile-1] == ParseConstants.RPAREN ||<a name="line.618"></a>
-<span class="sourceLineNo">619</span>           filterStringAsByteArray[indexOfWhile-1] == ParseConstants.LPAREN) &amp;&amp;<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          (filterStringAsByteArray[indexOfWhile+5] == ParseConstants.WHITESPACE ||<a name="line.620"></a>
-<span class="sourceLineNo">621</span>           filterStringAsByteArray[indexOfWhile+5] == ParseConstants.LPAREN)) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>        return true;<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      } else {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>        return false;<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      }<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    } catch (ArrayIndexOutOfBoundsException e) {<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      return false;<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>  }<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span>/**<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Returns a boolean indicating whether the quote was escaped or not<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * &lt;p&gt;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param array byte array in which the quote was found<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @param quoteIndex index of the single quote<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @return returns true if the quote was unescaped<a name="line.636"></a>
-<span class="sourceLineNo">637</span> */<a name="line.637"></a>
-<span class="sourceLineNo">638</span>  public static boolean isQuoteUnescaped (byte [] array, int quoteIndex) {<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    if (array == null) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      throw new IllegalArgumentException("isQuoteUnescaped called with a null array");<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>    if (quoteIndex == array.length - 1 || array[quoteIndex+1] != ParseConstants.SINGLE_QUOTE) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      return true;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    }<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    else {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      return false;<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>  }<a name="line.649"></a>
-<span class="sourceLineNo">650</span><a name="line.650"></a>
-<span class="sourceLineNo">651</span>/**<a name="line.651"></a>
-<span class="sourceLineNo">652</span> * Takes a quoted byte array and converts it into an unquoted byte array<a name="line.652"></a>
-<span class="sourceLineNo">653</span> * For example: given a byte array representing 'abc', it returns a<a name="line.653"></a>
-<span class="sourceLineNo">654</span> * byte array representing abc<a name="line.654"></a>
-<span class="sourceLineNo">655</span> * &lt;p&gt;<a name="line.655"></a>
-<span class="sourceLineNo">656</span> * @param quotedByteArray the quoted byte array<a name="line.656"></a>
-<span class="sourceLineNo">657</span> * @return Unquoted byte array<a name="line.657"></a>
-<span class="sourceLineNo">658</span> */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  public static byte [] removeQuotesFromByteArray (byte [] quotedByteArray) {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    if (quotedByteArray == null ||<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        quotedByteArray.length &lt; 2 ||<a name="line.661"></a>
-<span class="sourceLineNo">662</span>        quotedByteArray[0] != ParseConstants.SINGLE_QUOTE ||<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        quotedByteArray[quotedByteArray.length - 1] != ParseConstants.SINGLE_QUOTE) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      throw new IllegalArgumentException("removeQuotesFromByteArray needs a quoted byte array");<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    } else {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      byte [] targetString = new byte [quotedByteArray.length - 2];<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      Bytes.putBytes(targetString, 0, quotedByteArray, 1, quotedByteArray.length - 2);<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      return targetString;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
-<span class="sourceLineNo">670</span>  }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>/**<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * Converts an int expressed in a byte array to an actual int<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * &lt;p&gt;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * This doesn't use Bytes.toInt because that assumes<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * that there will be {@link Bytes#SIZEOF_INT} bytes available.<a name="line.676"></a>
-<span class="sourceLineNo">677</span> * &lt;p&gt;<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * @param numberAsByteArray the int value expressed as a byte array<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * @return the int value<a name="line.679"></a>
-<span class="sourceLineNo">680</span> */<a name="line.680"></a>
-<span class="sourceLineNo">681</span>  public static int convertByteArrayToInt (byte [] numberAsByteArray) {<a name="line.681"></a>
-<span class="sourceLineNo">682</span><a name="line.682"></a>
-<span class="sourceLineNo">683</span>    long tempResult = ParseFilter.convertByteArrayToLong(numberAsByteArray);<a name="line.683"></a>
-<span class="sourceLineNo">684</span><a name="line.684"></a>
-<span class="sourceLineNo">685</span>    if (tempResult &gt; Integer.MAX_VALUE) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      throw new IllegalArgumentException("Integer Argument too large");<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    } else if (tempResult &lt; Integer.MIN_VALUE) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      throw new IllegalArgumentException("Integer Argument too small");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>    int result = (int) tempResult;<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    return result;<a name="line.692"></a>
-<span class="sourceLineNo">693</span>  }<a name="line.693"></a>
-<span class="sourceLineNo">694</span><a name="line.694"></a>
-<span class="sourceLineNo">695</span>/**<a name="line.695"></a>
-<span class="sourceLineNo">696</span> * Converts a long expressed in a byte array to an actual long<a name="line.696"></a>
-<span class="sourceLineNo">697</span> * &lt;p&gt;<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * This doesn't use Bytes.toLong because that assumes<a name="line.698"></a>
-<span class="sourceLineNo">699</span> * that there will be {@link Bytes#SIZEOF_INT} bytes available.<a name="line.699"></a>
-<span class="sourceLineNo">700</span> * &lt;p&gt;<a name="line.700"></a>
-<span class="sourceLineNo">701</span> * @param numberAsByteArray the long value expressed as a byte array<a name="line.701"></a>
-<span class="sourceLineNo">702</span> * @return the long value<a name="line.702"></a>
-<span class="sourceLineNo">703</span> */<a name="line.703"></a>
-<span class="sourceLineNo">704</span>  public static long convertByteArrayToLong (byte [] numberAsByteArray) {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    if (numberAsByteArray == null) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span>      throw new IllegalArgumentException("convertByteArrayToLong called with a null array");<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    }<a name="line.707"></a>
-<span class="sourceLineNo">708</span><a name="line.708"></a>
-<span class="sourceLineNo">709</span>    int i = 0;<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    long result = 0;<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    boolean isNegative = false;<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span>    if (numberAsByteArray[i] == ParseConstants.MINUS_SIGN) {<a name="line.713"></a>
-<span class="sourceLineNo">714</span>      i++;<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      isNegative = true;<a name="line.715"></a>
-<span class="sourceLineNo">716</span>    }<a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span>    while (i != numberAsByteArray.length) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      if (numberAsByteArray[i] &lt; ParseConstants.ZERO ||<a name="line.719"></a>
-<span class="sourceLineNo">720</span>          numberAsByteArray[i] &gt; ParseConstants.NINE) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span>        throw new IllegalArgumentException("Byte Array should only contain digits");<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      }<a name="line.722"></a>
-<span class="sourceLineNo">723</span>      result = result*10 + (numberAsByteArray[i] - ParseConstants.ZERO);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>      if (result &lt; 0) {<a name="line.724"></a>
-<span class="sourceLineNo">725</span>        throw new IllegalArgumentException("Long Argument too large");<a name="line.725"></a>
-<span class="sourceLineNo">726</span>      }<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      i++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span>    if (isNegative) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span>      return -result;<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    } else {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      return result;<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    }<a name="line.734"></a>
-<span class="sourceLineNo">735</span>  }<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span>/**<a name="line.737"></a>
-<span class="sourceLineNo">738</span> * Converts a boolean expressed in a byte array to an actual boolean<a name="line.738"></a>
-<span class="sourceLineNo">739</span> *&lt;p&gt;<a name="line.739"></a>
-<span class="sourceLineNo">740</span> * This doesn't used Bytes.toBoolean because Bytes.toBoolean(byte [])<a name="line.740"></a>
-<span class="sourceLineNo">741</span> * assumes that 1 stands for true and 0 for false.<a name="line.741"></a>
-<span class="sourceLineNo">742</span> * Here, the byte array representing "true" and "false" is parsed<a name="line.742"></a>
-<span class="sourceLineNo">743</span> * &lt;p&gt;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> * @param booleanAsByteArray the boolean value expressed as a byte array<a name="line.744"></a>
-<span class="sourceLineNo">745</span> * @return the boolean value<a name="line.745"></a>
-<span class="sourceLineNo">746</span> */<a name="line.746"></a>
-<span class="sourceLineNo">747</span>  public static boolean convertByteArrayToBoolean (byte [] booleanAsByteArray) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    if (booleanAsByteArray == null) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span>      throw new IllegalArgumentException("convertByteArrayToBoolean called with a null array");<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    }<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span>    if (booleanAsByteArray.length == 4 &amp;&amp;<a name="line.752"></a>
-<span class="sourceLineNo">753</span>        (booleanAsByteArray[0] == 't' || booleanAsByteArray[0] == 'T') &amp;&amp;<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        (booleanAsByteArray[1] == 'r' || booleanAsByteArray[1] == 'R') &amp;&amp;<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        (booleanAsByteArray[2] == 'u' || booleanAsByteArray[2] == 'U') &amp;&amp;<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        (booleanAsByteArray[3] == 'e' || booleanAsByteArray[3] == 'E')) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>      return true;<a name="line.757"></a>
-<span class="sourceLineNo">758</span>    }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>    else if (booleanAsByteArray.length == 5 &amp;&amp;<a name="line.759"></a>
-<span class="sourceLineNo">760</span>             (booleanAsByteArray[0] == 'f' || booleanAsByteArray[0] == 'F') &amp;&amp;<a name="line.760"></a>
-<span class="sourceLineNo">761</span>             (booleanAsByteArray[1] == 'a' || booleanAsByteArray[1] == 'A') &amp;&amp;<a name="line.761"></a>
-<span class="sourceLineNo">762</span>             (booleanAsByteArray[2] == 'l' || booleanAsByteArray[2] == 'L') &amp;&amp;<a name="line.762"></a>
-<span class="sourceLineNo">763</span>             (booleanAsByteArray[3] == 's' || booleanAsByteArray[3] == 'S') &amp;&amp;<a name="line.763"></a>
-<span class="sourceLineNo">764</span>             (booleanAsByteArray[4] == 'e' || booleanAsByteArray[4] == 'E')) {<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      return false;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>    }<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    else {<a name="line.767"></a>
-<span class="sourceLineNo">768</span>      throw new IllegalArgumentException("Incorrect Boolean Expression");<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    }<a name="line.769"></a>
-<span class="sourceLineNo">770</span>  }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>  /**<a name="line.772"></a>
-<span class="sourceLineNo">773</span>   * Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator<a name="line.773"></a>
-<span class="sourceLineNo">774</span>   * @param compareOpAsByteArray the comparatorOperator symbol as a byte array<a name="line.774"></a>
-<span class="sourceLineNo">775</span>   * @return the Compare Operator<a name="line.775"></a>
-<span class="sourceLineNo">776</span>   */<a name="line.776"></a>
-<span class="sourceLineNo">777</span>  public static CompareOperator createCompareOperator (byte [] compareOpAsByteArray) {<a name="line.777"></a>
-<span class="sourceLineNo">778</span>    ByteBuffer compareOp = ByteBuffer.wrap(compareOpAsByteArray);<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    if (compareOp.equals(ParseConstants.LESS_THAN_BUFFER))<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      return CompareOperator.LESS;<a name="line.780"></a>
-<span class="sourceLineNo">781</span>    else if (compareOp.equals(ParseConstants.LESS_THAN_OR_EQUAL_TO_BUFFER))<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      return CompareOperator.LESS_OR_EQUAL;<a name="line.782"></a>
-<span class="sourceLineNo">783</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_BUFFER))<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      return CompareOperator.GREATER;<a name="line.784"></a>
-<span class="sourceLineNo">785</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_OR_EQUAL_TO_BUFFER))<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      return CompareOperator.GREATER_OR_EQUAL;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    else if (compareOp.equals(ParseConstants.NOT_EQUAL_TO_BUFFER))<a name="line.787"></a>
-<span class="sourceLineNo">788</span>      return CompareOperator.NOT_EQUAL;<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    else if (compareOp.equals(ParseConstants.EQUAL_TO_BUFFER))<a name="line.789"></a>
-<span class="sourceLineNo">790</span>      return CompareOperator.EQUAL;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    else<a name="line.791"></a>
-<span class="sourceLineNo">792</span>      throw new IllegalArgumentException("Invalid compare operator");<a name="line.792"></a>
-<span class="sourceLineNo">793</span>  }<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>  /**<a name="line.795"></a>
-<span class="sourceLineNo">796</span>   * Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator<a name="line.796"></a>
-<span class="sourceLineNo">797</span>   * @deprecated Since 2.0<a name="line.797"></a>
-<span class="sourceLineNo">798</span>   * &lt;p&gt;<a name="line.798"></a>
-<span class="sourceLineNo">799</span>   * @param compareOpAsByteArray the comparatorOperator symbol as a byte array<a name="line.799"></a>
-<span class="sourceLineNo">800</span>   * @return the Compare Operator<a name="line.800"></a>
-<span class="sourceLineNo">801</span>   * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use {@link #createCompareOperator(byte [])}<a name="line.801"></a>
-<span class="sourceLineNo">802</span>   */<a name="line.802"></a>
-<span class="sourceLineNo">803</span>  @Deprecated<a name="line.803"></a>
-<span class="sourceLineNo">804</span>  public static CompareFilter.CompareOp createCompareOp (byte [] compareOpAsByteArray) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    ByteBuffer compareOp = ByteBuffer.wrap(compareOpAsByteArray);<a name="line.805"></a>
-<span class="sourceLineNo">806</span>    if (compareOp.equals(ParseConstants.LESS_THAN_BUFFER))<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return CompareOp.LESS;<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    else if (compareOp.equals(ParseConstants.LESS_THAN_OR_EQUAL_TO_BUFFER))<a name="line.808"></a>
-<span class="sourceLineNo">809</span>      return CompareOp.LESS_OR_EQUAL;<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_BUFFER))<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      return CompareOp.GREATER;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>    else if (compareOp.equals(ParseConstants.GREATER_THAN_OR_EQUAL_TO_BUFFER))<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      return CompareOp.GREATER_OR_EQUAL;<a name="line.813"></a>
-<span class="sourceLineNo">814</span>    else if (compareOp.equals(ParseConstants.NOT_EQUAL_TO_BUFFER))<a name="line.814"></a>
-<span class="sourceLineNo">815</span>      return CompareOp.NOT_EQUAL;<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    else if (compareOp.equals(ParseConstants.EQUAL_TO_BUFFER))<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      return CompareOp.EQUAL;<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    else<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      throw new IllegalArgumentException("Invalid compare operator");<a name="line.819"></a>
-<span class="sourceLineNo">820</span>  }<a name="line.820"></a>
-<span class="sourceLineNo">821</span><a name="line.821"></a>
-<span class="sourceLineNo">822</span>/**<a name="line.822"></a>
-<span class="sourceLineNo">823</span> * Parses a comparator of the form comparatorType:comparatorValue form and returns a comparator<a name="line.823"></a>
-<span class="sourceLineNo">824</span> * &lt;p&gt;<a name="line.824"></a>
-<span class="sourceLineNo">825</span> * @param comparator the comparator in the form comparatorType:comparatorValue<a name="line.825"></a>
-<span class="sourceLineNo">826</span> * @return the parsed comparator<a name="line.826"></a>
-<span class="sourceLineNo">827</span> */<a name="line.827"></a>
-<span class="sourceLineNo">828</span>  public static ByteArrayComparable createComparator (byte [] comparator) {<a name="line.828"></a>
-<span class="sourceLineNo">829</span>    if (comparator == null)<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      throw new IllegalArgumentException("Incorrect Comparator");<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    byte [][] parsedComparator = ParseFilter.parseComparator(comparator);<a name="line.831"></a>
-<span class="sourceLineNo">832</span>    byte [] comparatorType = parsedComparator[0];<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    byte [] comparatorValue = parsedComparator[1];<a name="line.833"></a>
-<span class="sourceLineNo">834</span><a name="line.834"></a>
+<span class="sourceLineNo">251</span>    filterName = filterHashMap.get(filterName);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    final String methodName = "createFilterFromArguments";<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    try {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      Class&lt;?&gt; c = Class.forName(filterName);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      Class&lt;?&gt;[] argTypes = new Class[] { ArrayList.class };<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      Method m = c.getDeclaredMethod(methodName, argTypes);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      return (Filter) m.invoke(null, filterArguments);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    } catch (ClassNotFoundException e) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      LOG.error("Could not find class {}", filterName, e);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    } catch (NoSuchMethodException e) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      LOG.error("Could not find method {} in {}", methodName, filterName, e);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    } catch (IllegalAccessException e) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      LOG.error("Unable to access specified class {}", filterName, e);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } catch (InvocationTargetException e) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      LOG.error("Method {} threw an exception for {}", methodName, filterName, e);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    throw new IllegalArgumentException(<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        "Incorrect filter string " + new String(filterStringAsByteArray, StandardCharsets.UTF_8));<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>/**<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * Returns the filter name given a simple filter expression<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * &lt;p&gt;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * @param filterStringAsByteArray a simple filter expression<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @return name of filter in the simple filter expression<a name="line.275"></a>
+<span class="sourceLineNo">276</span> */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public static byte [] getFilterName (byte [] filterStringAsByteArray) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    int filterNameStartIndex = 0;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    int filterNameEndIndex = 0;<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>    for (int i=filterNameStartIndex; i&lt;filterStringAsByteArray.length; i++) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      if (filterStringAsByteArray[i] == ParseConstants.LPAREN ||<a name="line.282"></a>
+<span class="sourceLineNo">283</span>          filterStringAsByteArray[i] == ParseConstants.WHITESPACE) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        filterNameEndIndex = i;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        break;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<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>    if (filterNameEndIndex == 0) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      throw new IllegalArgumentException("Incorrect Filter Name");<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>    byte [] filterName = new byte[filterNameEndIndex - filterNameStartIndex];<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    Bytes.putBytes(filterName, 0, filterStringAsByteArray, 0,<a name="line.294"></a>
+<span class="sourceLineNo">295</span>                   filterNameEndIndex - filterNameStartIndex);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    return filterName;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>/**<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * Returns the arguments of the filter from the filter string<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * &lt;p&gt;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * @param filterStringAsByteArray filter string given by the user<a name="line.302"></a>
+<span class="sourceLineNo">303</span> * @return an ArrayList containing the arguments of the filter in the filter string<a name="line.303"></a>
+<span class="sourceLineNo">304</span> */<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  public static ArrayList&lt;byte []&gt; getFilterArguments (byte [] filterStringAsByteArray) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    int argumentListStartIndex = Bytes.searchDelimiterIndex(filterStringAsByteArray, 0,<a name="line.306"></a>
+<span class="sourceLineNo">307</span>                                                       filterStringAsByteArray.length,<a name="line.307"></a>
+<span class="sourceLineNo">308</span>                                                       ParseConstants.LPAREN);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    if (argumentListStartIndex == -1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      throw new IllegalArgumentException("Incorrect argument list");<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>    int argumentStartIndex = 0;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    int argumentEndIndex = 0;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    ArrayList&lt;byte []&gt; filterArguments = new ArrayList&lt;&gt;();<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    for (int i = argumentListStartIndex + 1; i&lt;filterStringAsByteArray.length; i++) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>      if (filterStringAsByteArray[i] == ParseConstants.WHITESPACE ||<a name="line.319"></a>
+<span class="sourceLineNo">320</span>          filterStringAsByteArray[i] == ParseConstants.COMMA ||<a name="line.320"></a>
+<span class="sourceLineNo">321</span>          filterStringAsByteArray[i] == ParseConstants.RPAREN) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        continue;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>      // The argument is in single quotes - for example 'prefix'<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        argumentStartIndex = i;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        for (int j = argumentStartIndex+1; j &lt; filterStringAsByteArray.length; j++) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>          if (filterStringAsByteArray[j] == ParseConstants.SINGLE_QUOTE) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            if (isQuoteUnescaped(filterStringAsByteArray,j)) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>              argumentEndIndex = j;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>              i = j+1;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>              byte [] filterArgument = createUnescapdArgument(filterStringAsByteArray,<a name="line.333"></a>
+<span class="sourceLineNo">334</span>                                                              argumentStartIndex, argumentEndIndex);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>              filterArguments.add(filterArgument);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>              break;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>            } else {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>              // To jump over the second escaped quote<a name="line.338"></a>
+<span class="sourceLineNo">339</span>              j++;<a name="line.339"></a>
+<span class="sourceLineNo">340</span>            }<a name="line.340"></a>
+<span class="sourceLineNo">341</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>            throw new IllegalArgumentException("Incorrect argument list");<a name="line.342"></a>
+<span class="sourceLineNo">343</span>          }<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      } else {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        // The argument is an integer, boolean, comparison operator like &lt;, &gt;, != etc<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        argumentStartIndex = i;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        for (int j = argumentStartIndex; j &lt; filterStringAsByteArray.length; j++) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>          if (filterStringAsByteArray[j] == ParseConstants.WHITESPACE ||<a name="line.349"></a>
+<span class="sourceLineNo">350</span>              filterStringAsByteArray[j] == ParseConstants.COMMA ||<a name="line.350"></a>
+<span class="sourceLineNo">351</span>              filterStringAsByteArray[j] == ParseConstants.RPAREN) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>            argumentEndIndex = j - 1;<a name="line.352"></a>
+<span class="sourceLineNo">353</span>            i = j;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>            byte [] filterArgument = new byte [argumentEndIndex - argumentStartIndex + 1];<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            Bytes.putBytes(filterArgument, 0, filterStringAsByteArray,<a name="line.355"></a>
+<span class="sourceLineNo">356</span>                           argumentStartIndex, argumentEndIndex - argumentStartIndex + 1);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            filterArguments.add(filterArgument);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>            break;<a name="line.358"></a>
+<span class="sourceLineNo">359</span>          } else if (j == filterStringAsByteArray.length - 1) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            throw new IllegalArgumentException("Incorrect argument list");<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>      }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    return filterArguments;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>/**<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * This function is called while parsing the filterString and an operator is parsed<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * &lt;p&gt;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * @param operatorStack the stack containing the operators and parenthesis<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * @param filterStack the stack containing the filters<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * @param operator the operator found while parsing the filterString<a name="line.373"></a>
+<span class="sourceLineNo">374</span> */<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  public void reduce(Stack&lt;ByteBuffer&gt; operatorStack,<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                     Stack&lt;Filter&gt; filterStack,<a name="line.376"></a>
+<span class="sourceLineNo">377</span>                     ByteBuffer operator) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    while (!operatorStack.empty() &amp;&amp;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>           !(ParseConstants.LPAREN_BUFFER.equals(operatorStack.peek())) &amp;&amp;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>           hasHigherPriority(operatorStack.peek(), operator)) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      filterStack.push(popArguments(operatorStack, filterStack));<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><a name="line.384"></a>
+<span class="sourceLineNo">385</span>  /**<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   * Pops an argument from the operator stack and the number of arguments required by the operator<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * from the filterStack and evaluates them<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * &lt;p&gt;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @param operatorStack the stack containing the operators<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @param filterStack the stack containing the filters<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * @return the evaluated filter<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  public static Filter popArguments (Stack&lt;ByteBuffer&gt; operatorStack, Stack &lt;Filter&gt; filterStack) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    ByteBuffer argumentOnTopOfStack = operatorStack.peek();<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>    if (argumentOnTopOfStack.equals(ParseConstants.OR_BUFFER)) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // The top of the stack is an OR<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      try {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.OR_BUFFER)) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          Filter filter = filterStack.pop();<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          listOfFilters.add(0, filter);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>          operatorStack.pop();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        Filter filter = filterStack.pop();<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        listOfFilters.add(0, filter);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        Filter orFilter = new FilterList(FilterList.Operator.MUST_PASS_ONE, listOfFilters);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        return orFilter;<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      } catch (EmptyStackException e) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        throw new IllegalArgumentException("Incorrect input string - an OR needs two filters");<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>    } else if (argumentOnTopOfStack.equals(ParseConstants.AND_BUFFER)) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      // The top of the stack is an AND<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      try {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>        ArrayList&lt;Filter&gt; listOfFilters = new ArrayList&lt;&gt;();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        while (!operatorStack.empty() &amp;&amp; operatorStack.peek().equals(ParseConstants.AND_BUFFER)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          Filter filter = filterStack.pop();<a name="line.418"></a>
+<span class="sourceLineNo">419</span>          listOfFilters.add(0, filter);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          operatorStack.pop();<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        }<a name="line.421"></a>
+<span class="sourceLineNo">422</span>        Filter filter = filterStack.pop();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        listOfFilters.add(0, filter);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>        Filter andFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL, listOfFilters);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        return andFilter;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      } catch (EmptyStackException e) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        throw new IllegalArgumentException("Incorrect input string - an AND needs two filters");<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.SKIP_BUFFER)) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      // The top of the stack is a SKIP<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      try {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        Filter wrappedFilter = filterStack.pop();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        Filter skipFilter = new SkipFilter(wrappedFilter);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        operatorStack.pop();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>        return skipFilter;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      } catch (EmptyStackException e) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>        throw new IllegalArgumentException("Incorrect input string - a SKIP wraps a filter");<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.WHILE_BUFFER)) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      // The top of the stack is a WHILE<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      try {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        Filter wrappedFilter = filterStack.pop();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>        Filter whileMatchFilter = new WhileMatchFilter(wrappedFilter);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        operatorStack.pop();<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        return whileMatchFilter;<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      } catch (EmptyStackException e) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        throw new IllegalArgumentException("Incorrect input string - a WHILE wraps a filter");<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>    } else if (argumentOnTopOfStack.equals(ParseConstants.LPAREN_BUFFER)) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      // The top of the stack is a LPAREN<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      try {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        Filter filter  = filterStack.pop();<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        operatorStack.pop();<a name="line.456"></a>
+<span class="sourceLineNo">457</span>        return filter;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      } catch (EmptyStackException e) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>        throw new IllegalArgumentException("Incorrect Filter String");<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      }<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span>    } else {<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      throw new IllegalArgumentException("Incorrect arguments on operatorStack");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>  }<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>/**<a name="line.467"></a>
+<span class="sourceLineNo">468</span> * Returns which operator has higher precedence<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * &lt;p&gt;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * If a has higher precedence than b, it returns true<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * If they have the same precedence, it returns false<a name="line.471"></a>
+<span class="sourceLineNo">472</span> */<a name="line.472"></a>
+<span class="sourceLineNo">473</span>  public boolean hasHigherPriority(ByteBuffer a, ByteBuffer b) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    if ((operatorPrecedenceHashMap.get(a) - operatorPrecedenceHashMap.get(b)) &lt; 0) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      return true;<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    }<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    return false;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span>/**<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * Removes the single quote escaping a single quote - thus it returns an unescaped argument<a name="line.481"></a>
+<span class="sourceLineNo">482</span> * &lt;p&gt;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> * @param filterStringAsByteArray filter string given by user<a name="line.483"></a>
+<span class="sourceLineNo">484</span> * @param argumentStartIndex start index of the argument<a name="line.484"></a>
+<span class="sourceLineNo">485</span> * @param argumentEndIndex end index of the argument<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return returns an unescaped argument<a name="line.486"></a>
+<span class="sourceLineNo">487</span> */<a name="line.487"></a>
+<span class="sourceLineNo">488</span>  public static byte [] createUnescapdArgument (byte [] filterStringAsByteArray,<a name="line.488"></a>
+<span class="sourceLineNo">489</span>                                                int argumentStartIndex, int argumentEndIndex) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    int unescapedArgumentLength = 2;<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>      unescapedArgumentLength ++;<a name="line.492"></a>
+<span class="sourceLineNo">493</span>      if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.493"></a>
+<span class="sourceLineNo">494</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.494"></a>
+<span class="sourceLineNo">495</span>          filterStringAsByteArray[i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span>        i++;<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        continue;<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span>    byte [] unescapedArgument = new byte [unescapedArgumentLength];<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    int count = 1;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    unescapedArgument[0] = '\'';<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    for (int i = argumentStartIndex + 1; i &lt;= argumentEndIndex - 1; i++) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      if (filterStringAsByteArray [i] == ParseConstants.SINGLE_QUOTE &amp;&amp;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>          i != (argumentEndIndex - 1) &amp;&amp;<a name="line.506"></a>
+<span class="sourceLineNo">507</span>          filterStringAsByteArray [i+1] == ParseConstants.SINGLE_QUOTE) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>        unescapedArgument[count++] = filterStringAsByteArray [i+1];<a name="line.508"></a>
+<span class="sourceLineNo">509</span>        i++;<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      }<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      else {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        unescapedArgument[count++] = filterStringAsByteArray [i];<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    }<a name="line.514"></a>
+<span class="sourceLineNo">515</span>    unescapedArgument[unescapedArgumentLength - 1] = '\'';<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    return unescapedArgument;<a name="line.516"></a>
+<span class="sourceLineNo">517</span>  }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>/**<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * Checks if the current index of filter string we are on is the beginning of the keyword 'OR'<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * &lt;p&gt;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * @param filterStringAsByteArray filter string given by the user<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * @param indexOfOr index at which an 'O' was read<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return true if the keyword 'OR' is at the current index<a name="line.524"></a>
+<span class="sourceLineNo">525</span> */<a name="line.525"></a>
+<span class="sourceLineNo">526</span>  public static boolean checkForOr (byte [] filterStringAsByteArray, int indexOfOr)<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    throws CharacterCodingException, ArrayIndexOutOfBoundsException {<a name="line.527"></a

<TRUNCATED>