hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [02/52] [partial] hbase git commit: Published website at 40c7b09ac86bdbf560321fa71867112aea92a324
Date Wed, 11 Nov 2015 02:24:08 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/1619ae4c/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportExport.TableWALActionListener.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportExport.TableWALActionListener.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportExport.TableWALActionListener.html
index 59869b4..67563a5 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportExport.TableWALActionListener.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportExport.TableWALActionListener.html
@@ -177,552 +177,551 @@
 <span class="sourceLineNo">169</span>  @Test<a name="line.169"></a>
 <span class="sourceLineNo">170</span>  public void testSimpleCase() throws Exception {<a name="line.170"></a>
 <span class="sourceLineNo">171</span>    String EXPORT_TABLE = "exportSimpleCase";<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    Table t = UTIL.createTable(TableName.valueOf(EXPORT_TABLE), FAMILYA, 3);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    Put p = new Put(ROW1);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    t.put(p);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    p = new Put(ROW2);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    t.put(p);<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>    String[] args = new String[] {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        EXPORT_TABLE,<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        FQ_OUTPUT_DIR,<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        "1000", // max number of key versions per key to export<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    };<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    assertTrue(runExport(args));<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>    String IMPORT_TABLE = "importTableSimpleCase";<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    t = UTIL.createTable(TableName.valueOf(IMPORT_TABLE), FAMILYB, 3);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    args = new String[] {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        "-D" + Import.CF_RENAME_PROP + "="+FAMILYA_STRING+":"+FAMILYB_STRING,<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        IMPORT_TABLE,<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        FQ_OUTPUT_DIR<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    };<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    assertTrue(runImport(args));<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    Get g = new Get(ROW1);<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    g.setMaxVersions();<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    Result r = t.get(g);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    assertEquals(3, r.size());<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    g = new Get(ROW2);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    g.setMaxVersions();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    r = t.get(g);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    assertEquals(3, r.size());<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>  /**<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   * Test export hbase:meta table<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   *<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   * @throws Exception<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   */<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  @Test<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  public void testMetaExport() throws Exception {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    String EXPORT_TABLE = TableName.META_TABLE_NAME.getNameAsString();<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    String[] args = new String[] { EXPORT_TABLE, FQ_OUTPUT_DIR, "1", "0", "0" };<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    assertTrue(runExport(args));<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>   * Test import data from 0.94 exported file<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   * @throws Exception<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 testImport94Table() throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    final String name = "exportedTableIn94Format";<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    URL url = TestImportExport.class.getResource(name);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    File f = new File(url.toURI());<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    if (!f.exists()) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      LOG.warn("FAILED TO FIND " + f + "; skipping out on test");<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      return;<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    assertTrue(f.exists());<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    LOG.info("FILE=" + f);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    Path importPath = new Path(f.toURI());<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    FileSystem fs = FileSystem.get(UTIL.getConfiguration());<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    fs.copyFromLocalFile(importPath, new Path(FQ_OUTPUT_DIR + Path.SEPARATOR + name));<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    String IMPORT_TABLE = name;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Table t = UTIL.createTable(TableName.valueOf(IMPORT_TABLE), Bytes.toBytes("f1"), 3);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    String[] args = new String[] {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        "-Dhbase.import.version=0.94" ,<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        IMPORT_TABLE, FQ_OUTPUT_DIR<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    };<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    assertTrue(runImport(args));<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>    /* exportedTableIn94Format contains 5 rows<a name="line.248"></a>
-<span class="sourceLineNo">249</span>     ROW         COLUMN+CELL<a name="line.249"></a>
-<span class="sourceLineNo">250</span>     r1          column=f1:c1, timestamp=1383766761171, value=val1<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     r2          column=f1:c1, timestamp=1383766771642, value=val2<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     r3          column=f1:c1, timestamp=1383766777615, value=val3<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     r4          column=f1:c1, timestamp=1383766785146, value=val4<a name="line.253"></a>
-<span class="sourceLineNo">254</span>     r5          column=f1:c1, timestamp=1383766791506, value=val5<a name="line.254"></a>
-<span class="sourceLineNo">255</span>     */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    assertEquals(5, UTIL.countRows(t));<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    t.close();<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>  /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   * Test export scanner batching<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   */<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   @Test<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   public void testExportScannerBatching() throws Exception {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    String BATCH_TABLE = "exportWithBatch";<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(BATCH_TABLE));<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.267"></a>
-<span class="sourceLineNo">268</span>        .setMaxVersions(1)<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    );<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>     Table t = UTIL.getConnection().getTable(desc.getTableName());<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>    Put p = new Put(ROW1);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>     p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>     p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>     p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>     p.addColumn(FAMILYA, QUAL, now + 3, QUAL);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>     p.addColumn(FAMILYA, QUAL, now + 4, QUAL);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>     t.put(p);<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>    String[] args = new String[] {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        "-D" + Export.EXPORT_BATCHING + "=" + EXPORT_BATCH_SIZE,  // added scanner batching arg.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        BATCH_TABLE,<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        FQ_OUTPUT_DIR<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    };<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    assertTrue(runExport(args));<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    FileSystem fs = FileSystem.get(UTIL.getConfiguration());<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    fs.delete(new Path(FQ_OUTPUT_DIR), true);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    t.close();<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>  @Test<a name="line.293"></a>
-<span class="sourceLineNo">294</span>  public void testWithDeletes() throws Exception {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    String EXPORT_TABLE = "exportWithDeletes";<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(EXPORT_TABLE));<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        .setMaxVersions(5)<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    );<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    Table t = UTIL.getConnection().getTable(desc.getTableName());<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span>    Put p = new Put(ROW1);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    p.addColumn(FAMILYA, QUAL, now + 3, QUAL);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    p.addColumn(FAMILYA, QUAL, now + 4, QUAL);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    t.put(p);<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>    Delete d = new Delete(ROW1, now+3);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    t.delete(d);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    d = new Delete(ROW1);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    d.addColumns(FAMILYA, QUAL, now+2);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    t.delete(d);<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>    String[] args = new String[] {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        "-D" + Export.RAW_SCAN + "=true",<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        EXPORT_TABLE,<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        FQ_OUTPUT_DIR,<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        "1000", // max number of key versions per key to export<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    };<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    assertTrue(runExport(args));<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    String IMPORT_TABLE = "importWithDeletes";<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    desc = new HTableDescriptor(TableName.valueOf(IMPORT_TABLE));<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.328"></a>
-<span class="sourceLineNo">329</span>        .setMaxVersions(5)<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    );<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    t.close();<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    t = UTIL.getConnection().getTable(desc.getTableName());<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    args = new String[] {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>        IMPORT_TABLE,<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        FQ_OUTPUT_DIR<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    };<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    assertTrue(runImport(args));<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    Scan s = new Scan();<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    s.setMaxVersions();<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    s.setRaw(true);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    ResultScanner scanner = t.getScanner(s);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    Result r = scanner.next();<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    Cell[] res = r.rawCells();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    assertTrue(CellUtil.isDeleteFamily(res[0]));<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    assertEquals(now+4, res[1].getTimestamp());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    assertEquals(now+3, res[2].getTimestamp());<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    assertTrue(CellUtil.isDelete(res[3]));<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    assertEquals(now+2, res[4].getTimestamp());<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    assertEquals(now+1, res[5].getTimestamp());<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    assertEquals(now, res[6].getTimestamp());<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    t.close();<a name="line.354"></a>
-<span class="sourceLineNo">355</span>  }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">172</span>    try (Table t = UTIL.createTable(TableName.valueOf(EXPORT_TABLE), FAMILYA, 3);) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      Put p = new Put(ROW1);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      t.put(p);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      p = new Put(ROW2);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      t.put(p);<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>      String[] args = new String[] {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>          EXPORT_TABLE,<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          FQ_OUTPUT_DIR,<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          "1000", // max number of key versions per key to export<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      };<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      assertTrue(runExport(args));<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>      String IMPORT_TABLE = "importTableSimpleCase";<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      try (Table t = UTIL.createTable(TableName.valueOf(IMPORT_TABLE), FAMILYB, 3);) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        args = new String[] {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>            "-D" + Import.CF_RENAME_PROP + "="+FAMILYA_STRING+":"+FAMILYB_STRING,<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            IMPORT_TABLE,<a name="line.196"></a>
+<span class="sourceLineNo">197</span>            FQ_OUTPUT_DIR<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        };<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        assertTrue(runImport(args));<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>        Get g = new Get(ROW1);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        g.setMaxVersions();<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        Result r = t.get(g);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        assertEquals(3, r.size());<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        g = new Get(ROW2);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        g.setMaxVersions();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        r = t.get(g);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        assertEquals(3, r.size());<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<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>  /**<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   * Test export hbase:meta table<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   *<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * @throws Exception<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  @Test<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  public void testMetaExport() throws Exception {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    String EXPORT_TABLE = TableName.META_TABLE_NAME.getNameAsString();<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    String[] args = new String[] { EXPORT_TABLE, FQ_OUTPUT_DIR, "1", "0", "0" };<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    assertTrue(runExport(args));<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>  /**<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * Test import data from 0.94 exported file<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * @throws Exception<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  @Test<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  public void testImport94Table() throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    final String name = "exportedTableIn94Format";<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    URL url = TestImportExport.class.getResource(name);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    File f = new File(url.toURI());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    if (!f.exists()) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      LOG.warn("FAILED TO FIND " + f + "; skipping out on test");<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      return;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    assertTrue(f.exists());<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    LOG.info("FILE=" + f);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    Path importPath = new Path(f.toURI());<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    FileSystem fs = FileSystem.get(UTIL.getConfiguration());<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    fs.copyFromLocalFile(importPath, new Path(FQ_OUTPUT_DIR + Path.SEPARATOR + name));<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    String IMPORT_TABLE = name;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    try (Table t = UTIL.createTable(TableName.valueOf(IMPORT_TABLE), Bytes.toBytes("f1"), 3);) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      String[] args = new String[] {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>          "-Dhbase.import.version=0.94" ,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          IMPORT_TABLE, FQ_OUTPUT_DIR<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      };<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      assertTrue(runImport(args));<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      /* exportedTableIn94Format contains 5 rows<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      ROW         COLUMN+CELL<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      r1          column=f1:c1, timestamp=1383766761171, value=val1<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      r2          column=f1:c1, timestamp=1383766771642, value=val2<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      r3          column=f1:c1, timestamp=1383766777615, value=val3<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      r4          column=f1:c1, timestamp=1383766785146, value=val4<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      r5          column=f1:c1, timestamp=1383766791506, value=val5<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>     assertEquals(5, UTIL.countRows(t));<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><a name="line.260"></a>
+<span class="sourceLineNo">261</span>  /**<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   * Test export scanner batching<a name="line.262"></a>
+<span class="sourceLineNo">263</span>   */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   @Test<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   public void testExportScannerBatching() throws Exception {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    String BATCH_TABLE = "exportWithBatch";<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(BATCH_TABLE));<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        .setMaxVersions(1)<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    );<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    try (Table t = UTIL.getConnection().getTable(desc.getTableName());) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span>      Put p = new Put(ROW1);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      p.addColumn(FAMILYA, QUAL, now + 3, QUAL);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      p.addColumn(FAMILYA, QUAL, now + 4, QUAL);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      t.put(p);<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>      String[] args = new String[] {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>          "-D" + Export.EXPORT_BATCHING + "=" + EXPORT_BATCH_SIZE,  // added scanner batching arg.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>          BATCH_TABLE,<a name="line.284"></a>
+<span class="sourceLineNo">285</span>          FQ_OUTPUT_DIR<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      };<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      assertTrue(runExport(args));<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>      FileSystem fs = FileSystem.get(UTIL.getConfiguration());<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      fs.delete(new Path(FQ_OUTPUT_DIR), true);<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><a name="line.293"></a>
+<span class="sourceLineNo">294</span>  @Test<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  public void testWithDeletes() throws Exception {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    String EXPORT_TABLE = "exportWithDeletes";<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(EXPORT_TABLE));<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        .setMaxVersions(5)<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    );<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    try (Table t = UTIL.getConnection().getTable(desc.getTableName());) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>      Put p = new Put(ROW1);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      p.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      p.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      p.addColumn(FAMILYA, QUAL, now + 3, QUAL);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      p.addColumn(FAMILYA, QUAL, now + 4, QUAL);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      t.put(p);<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>      Delete d = new Delete(ROW1, now+3);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      t.delete(d);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      d = new Delete(ROW1);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      d.addColumns(FAMILYA, QUAL, now+2);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      t.delete(d);<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>    String[] args = new String[] {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        "-D" + Export.RAW_SCAN + "=true",<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        EXPORT_TABLE,<a name="line.322"></a>
+<span class="sourceLineNo">323</span>        FQ_OUTPUT_DIR,<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        "1000", // max number of key versions per key to export<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    };<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    assertTrue(runExport(args));<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>    String IMPORT_TABLE = "importWithDeletes";<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    desc = new HTableDescriptor(TableName.valueOf(IMPORT_TABLE));<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        .setMaxVersions(5)<a name="line.331"></a>
+<span class="sourceLineNo">332</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    );<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    try (Table t = UTIL.getConnection().getTable(desc.getTableName());) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      args = new String[] {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>          IMPORT_TABLE,<a name="line.337"></a>
+<span class="sourceLineNo">338</span>          FQ_OUTPUT_DIR<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      };<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      assertTrue(runImport(args));<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>      Scan s = new Scan();<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      s.setMaxVersions();<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      s.setRaw(true);<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      ResultScanner scanner = t.getScanner(s);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      Result r = scanner.next();<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      Cell[] res = r.rawCells();<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      assertTrue(CellUtil.isDeleteFamily(res[0]));<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      assertEquals(now+4, res[1].getTimestamp());<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      assertEquals(now+3, res[2].getTimestamp());<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      assertTrue(CellUtil.isDelete(res[3]));<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      assertEquals(now+2, res[4].getTimestamp());<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      assertEquals(now+1, res[5].getTimestamp());<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      assertEquals(now, res[6].getTimestamp());<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    }<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>  @Test<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  public void testWithMultipleDeleteFamilyMarkersOfSameRowSameFamily() throws Exception {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    TableName EXPORT_TABLE =<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        TableName.valueOf("exportWithMultipleDeleteFamilyMarkersOfSameRowSameFamily");<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    HTableDescriptor desc = new HTableDescriptor(EXPORT_TABLE);<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.363"></a>
-<span class="sourceLineNo">364</span>        .setMaxVersions(5)<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    );<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>    Table exportT = UTIL.getConnection().getTable(EXPORT_TABLE);<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>    //Add first version of QUAL<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    Put p = new Put(ROW1);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    exportT.put(p);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span>    //Add Delete family marker<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    Delete d = new Delete(ROW1, now+3);<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    exportT.delete(d);<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>    //Add second version of QUAL<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    p = new Put(ROW1);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    p.addColumn(FAMILYA, QUAL, now + 5, "s".getBytes());<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    exportT.put(p);<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>    //Add second Delete family marker<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    d = new Delete(ROW1, now+7);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    exportT.delete(d);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>  @Test<a name="line.359"></a>
+<span class="sourceLineNo">360</span>  public void testWithMultipleDeleteFamilyMarkersOfSameRowSameFamily() throws Exception {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    TableName EXPORT_TABLE =<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        TableName.valueOf("exportWithMultipleDeleteFamilyMarkersOfSameRowSameFamily");<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    HTableDescriptor desc = new HTableDescriptor(EXPORT_TABLE);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        .setMaxVersions(5)<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    );<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>    Table exportT = UTIL.getConnection().getTable(EXPORT_TABLE);<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>    //Add first version of QUAL<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    Put p = new Put(ROW1);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    p.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    exportT.put(p);<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>    //Add Delete family marker<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    Delete d = new Delete(ROW1, now+3);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    exportT.delete(d);<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>    //Add second version of QUAL<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    p = new Put(ROW1);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    p.addColumn(FAMILYA, QUAL, now + 5, "s".getBytes());<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    exportT.put(p);<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>    //Add second Delete family marker<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    d = new Delete(ROW1, now+7);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    exportT.delete(d);<a name="line.388"></a>
 <span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>    String[] args = new String[] {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>        "-D" + Export.RAW_SCAN + "=true", EXPORT_TABLE.getNameAsString(),<a name="line.391"></a>
-<span class="sourceLineNo">392</span>        FQ_OUTPUT_DIR,<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        "1000", // max number of key versions per key to export<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    };<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    assertTrue(runExport(args));<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>    String IMPORT_TABLE = "importWithMultipleDeleteFamilyMarkersOfSameRowSameFamily";<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    desc = new HTableDescriptor(TableName.valueOf(IMPORT_TABLE));<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        .setMaxVersions(5)<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    );<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>    Table importT = UTIL.getConnection().getTable(TableName.valueOf(IMPORT_TABLE));<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    args = new String[] {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        IMPORT_TABLE,<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        FQ_OUTPUT_DIR<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    };<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    assertTrue(runImport(args));<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>    Scan s = new Scan();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    s.setMaxVersions();<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    s.setRaw(true);<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>    ResultScanner importedTScanner = importT.getScanner(s);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    Result importedTResult = importedTScanner.next();<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>    ResultScanner exportedTScanner = exportT.getScanner(s);<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    Result  exportedTResult =  exportedTScanner.next();<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    try<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    {<a name="line.422"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    String[] args = new String[] {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        "-D" + Export.RAW_SCAN + "=true", EXPORT_TABLE.getNameAsString(),<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        FQ_OUTPUT_DIR,<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        "1000", // max number of key versions per key to export<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    };<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    assertTrue(runExport(args));<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>    String IMPORT_TABLE = "importWithMultipleDeleteFamilyMarkersOfSameRowSameFamily";<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    desc = new HTableDescriptor(TableName.valueOf(IMPORT_TABLE));<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    desc.addFamily(new HColumnDescriptor(FAMILYA)<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        .setMaxVersions(5)<a name="line.401"></a>
+<span class="sourceLineNo">402</span>        .setKeepDeletedCells(KeepDeletedCells.TRUE)<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    );<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    Table importT = UTIL.getConnection().getTable(TableName.valueOf(IMPORT_TABLE));<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    args = new String[] {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        IMPORT_TABLE,<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        FQ_OUTPUT_DIR<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    };<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    assertTrue(runImport(args));<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>    Scan s = new Scan();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    s.setMaxVersions();<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    s.setRaw(true);<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>    ResultScanner importedTScanner = importT.getScanner(s);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    Result importedTResult = importedTScanner.next();<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span>    ResultScanner exportedTScanner = exportT.getScanner(s);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    Result  exportedTResult =  exportedTScanner.next();<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    try {<a name="line.422"></a>
 <span class="sourceLineNo">423</span>      Result.compareResults(exportedTResult, importedTResult);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    catch (Exception e) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      fail("Original and imported tables data comparision failed with error:"+e.getMessage());<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    finally<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      exportT.close();<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      importT.close();<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 simple table, run an Export Job on it, Import with filtering on,  verify counts,<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * attempt with invalid values.<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   */<a name="line.438"></a>
-<span class="sourceLineNo">439</span>  @Test<a name="line.439"></a>
-<span class="sourceLineNo">440</span>  public void testWithFilter() throws Exception {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    // Create simple table to export<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    String EXPORT_TABLE = "exportSimpleCase_ImportWithFilter";<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(EXPORT_TABLE));<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    desc.addFamily(new HColumnDescriptor(FAMILYA).setMaxVersions(5));<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    Table exportTable = UTIL.getConnection().getTable(desc.getTableName());<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>    Put p1 = new Put(ROW1);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    p1.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    p1.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    p1.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    p1.addColumn(FAMILYA, QUAL, now + 3, QUAL);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    p1.addColumn(FAMILYA, QUAL, now + 4, QUAL);<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span>    // Having another row would actually test the filter.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    Put p2 = new Put(ROW2);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    p2.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    exportTable.put(Arrays.asList(p1, p2));<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>    // Export the simple table<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    String[] args = new String[] { EXPORT_TABLE, FQ_OUTPUT_DIR, "1000" };<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    assertTrue(runExport(args));<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>    // Import to a new table<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    String IMPORT_TABLE = "importWithFilter";<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    desc = new HTableDescriptor(TableName.valueOf(IMPORT_TABLE));<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    desc.addFamily(new HColumnDescriptor(FAMILYA).setMaxVersions(5));<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span>    Table importTable = UTIL.getConnection().getTable(desc.getTableName());<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    args = new String[] { "-D" + Import.FILTER_CLASS_CONF_KEY + "=" + PrefixFilter.class.getName(),<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        "-D" + Import.FILTER_ARGS_CONF_KEY + "=" + Bytes.toString(ROW1), IMPORT_TABLE, FQ_OUTPUT_DIR,<a name="line.473"></a>
-<span class="sourceLineNo">474</span>        "1000" };<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    assertTrue(runImport(args));<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span>    // get the count of the source table for that time range<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    PrefixFilter filter = new PrefixFilter(ROW1);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    int count = getCount(exportTable, filter);<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>    Assert.assertEquals("Unexpected row count between export and import tables", count,<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      getCount(importTable, null));<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span>    // and then test that a broken command doesn't bork everything - easier here because we don't<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    // need to re-run the export job<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>    args = new String[] { "-D" + Import.FILTER_CLASS_CONF_KEY + "=" + Filter.class.getName(),<a name="line.487"></a>
-<span class="sourceLineNo">488</span>        "-D" + Import.FILTER_ARGS_CONF_KEY + "=" + Bytes.toString(ROW1) + "", EXPORT_TABLE,<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        FQ_OUTPUT_DIR, "1000" };<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    assertFalse(runImport(args));<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>    // cleanup<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    exportTable.close();<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    importTable.close();<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>   * Count the number of keyvalues in the specified table for the given timerange<a name="line.498"></a>
-<span class="sourceLineNo">499</span>   * @param start<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   * @param end<a name="line.500"></a>
-<span class="sourceLineNo">501</span>   * @param table<a name="line.501"></a>
-<span class="sourceLineNo">502</span>   * @return<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * @throws IOException<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   */<a name="line.504"></a>
-<span class="sourceLineNo">505</span>  private int getCount(Table table, Filter filter) throws IOException {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    Scan scan = new Scan();<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    scan.setFilter(filter);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    ResultScanner results = table.getScanner(scan);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    int count = 0;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    for (Result res : results) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>      count += res.size();<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    results.close();<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    return count;<a name="line.514"></a>
-<span class="sourceLineNo">515</span>  }<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>   * test main method. Import should print help and call System.exit<a name="line.518"></a>
-<span class="sourceLineNo">519</span>   */<a name="line.519"></a>
-<span class="sourceLineNo">520</span>  @Test<a name="line.520"></a>
-<span class="sourceLineNo">521</span>  public void testImportMain() throws Exception {<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    PrintStream oldPrintStream = System.err;<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    SecurityManager SECURITY_MANAGER = System.getSecurityManager();<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    LauncherSecurityManager newSecurityManager= new LauncherSecurityManager();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    System.setSecurityManager(newSecurityManager);<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    ByteArrayOutputStream data = new ByteArrayOutputStream();<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    String[] args = {};<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    System.setErr(new PrintStream(data));<a name="line.528"></a>
-<span class="sourceLineNo">529</span>    try {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      System.setErr(new PrintStream(data));<a name="line.530"></a>
-<span class="sourceLineNo">531</span>      Import.main(args);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      fail("should be SecurityException");<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    } catch (SecurityException e) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      assertEquals(-1, newSecurityManager.getExitCode());<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      assertTrue(data.toString().contains("Wrong number of arguments:"));<a name="line.535"></a>
+<span class="sourceLineNo">424</span>    } catch (Exception e) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      fail("Original and imported tables data comparision failed with error:"+e.getMessage());<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    } finally {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      exportT.close();<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      importT.close();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    }<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>   * Create a simple table, run an Export Job on it, Import with filtering on,  verify counts,<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   * attempt with invalid values.<a name="line.434"></a>
+<span class="sourceLineNo">435</span>   */<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  @Test<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  public void testWithFilter() throws Exception {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    // Create simple table to export<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    String EXPORT_TABLE = "exportSimpleCase_ImportWithFilter";<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(EXPORT_TABLE));<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    desc.addFamily(new HColumnDescriptor(FAMILYA).setMaxVersions(5));<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    Table exportTable = UTIL.getConnection().getTable(desc.getTableName());<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>    Put p1 = new Put(ROW1);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    p1.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    p1.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    p1.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    p1.addColumn(FAMILYA, QUAL, now + 3, QUAL);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    p1.addColumn(FAMILYA, QUAL, now + 4, QUAL);<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>    // Having another row would actually test the filter.<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    Put p2 = new Put(ROW2);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    p2.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span>    exportTable.put(Arrays.asList(p1, p2));<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>    // Export the simple table<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    String[] args = new String[] { EXPORT_TABLE, FQ_OUTPUT_DIR, "1000" };<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    assertTrue(runExport(args));<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span>    // Import to a new table<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    String IMPORT_TABLE = "importWithFilter";<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    desc = new HTableDescriptor(TableName.valueOf(IMPORT_TABLE));<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    desc.addFamily(new HColumnDescriptor(FAMILYA).setMaxVersions(5));<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    UTIL.getHBaseAdmin().createTable(desc);<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>    Table importTable = UTIL.getConnection().getTable(desc.getTableName());<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    args = new String[] { "-D" + Import.FILTER_CLASS_CONF_KEY + "=" + PrefixFilter.class.getName(),<a name="line.469"></a>
+<span class="sourceLineNo">470</span>        "-D" + Import.FILTER_ARGS_CONF_KEY + "=" + Bytes.toString(ROW1), IMPORT_TABLE,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        FQ_OUTPUT_DIR,<a name="line.471"></a>
+<span class="sourceLineNo">472</span>        "1000" };<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    assertTrue(runImport(args));<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span>    // get the count of the source table for that time range<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    PrefixFilter filter = new PrefixFilter(ROW1);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    int count = getCount(exportTable, filter);<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    Assert.assertEquals("Unexpected row count between export and import tables", count,<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      getCount(importTable, null));<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>    // and then test that a broken command doesn't bork everything - easier here because we don't<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    // need to re-run the export job<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span>    args = new String[] { "-D" + Import.FILTER_CLASS_CONF_KEY + "=" + Filter.class.getName(),<a name="line.485"></a>
+<span class="sourceLineNo">486</span>        "-D" + Import.FILTER_ARGS_CONF_KEY + "=" + Bytes.toString(ROW1) + "", EXPORT_TABLE,<a name="line.486"></a>
+<span class="sourceLineNo">487</span>        FQ_OUTPUT_DIR, "1000" };<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    assertFalse(runImport(args));<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>    // cleanup<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    exportTable.close();<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    importTable.close();<a name="line.492"></a>
+<span class="sourceLineNo">493</span>  }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span>  /**<a name="line.495"></a>
+<span class="sourceLineNo">496</span>   * Count the number of keyvalues in the specified table for the given timerange<a name="line.496"></a>
+<span class="sourceLineNo">497</span>   * @param start<a name="line.497"></a>
+<span class="sourceLineNo">498</span>   * @param end<a name="line.498"></a>
+<span class="sourceLineNo">499</span>   * @param table<a name="line.499"></a>
+<span class="sourceLineNo">500</span>   * @return<a name="line.500"></a>
+<span class="sourceLineNo">501</span>   * @throws IOException<a name="line.501"></a>
+<span class="sourceLineNo">502</span>   */<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  private int getCount(Table table, Filter filter) throws IOException {<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    Scan scan = new Scan();<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    scan.setFilter(filter);<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    ResultScanner results = table.getScanner(scan);<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    int count = 0;<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    for (Result res : results) {<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      count += res.size();<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    }<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    results.close();<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    return count;<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>  /**<a name="line.515"></a>
+<span class="sourceLineNo">516</span>   * test main method. Import should print help and call System.exit<a name="line.516"></a>
+<span class="sourceLineNo">517</span>   */<a name="line.517"></a>
+<span class="sourceLineNo">518</span>  @Test<a name="line.518"></a>
+<span class="sourceLineNo">519</span>  public void testImportMain() throws Exception {<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    PrintStream oldPrintStream = System.err;<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    SecurityManager SECURITY_MANAGER = System.getSecurityManager();<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    LauncherSecurityManager newSecurityManager= new LauncherSecurityManager();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    System.setSecurityManager(newSecurityManager);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    ByteArrayOutputStream data = new ByteArrayOutputStream();<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    String[] args = {};<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    System.setErr(new PrintStream(data));<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    try {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      System.setErr(new PrintStream(data));<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      Import.main(args);<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      fail("should be SecurityException");<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    } catch (SecurityException e) {<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      assertEquals(-1, newSecurityManager.getExitCode());<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      assertTrue(data.toString().contains("Wrong number of arguments:"));<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      assertTrue(data.toString().contains("-Dimport.bulk.output=/path/for/output"));<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      assertTrue(data.toString().contains("-Dimport.filter.class=&lt;name of filter class&gt;"));<a name="line.535"></a>
 <span class="sourceLineNo">536</span>      assertTrue(data.toString().contains("-Dimport.bulk.output=/path/for/output"));<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      assertTrue(data.toString().contains("-Dimport.filter.class=&lt;name of filter class&gt;"));<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      assertTrue(data.toString().contains("-Dimport.bulk.output=/path/for/output"));<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      assertTrue(data.toString().contains("-Dmapreduce.reduce.speculative=false"));<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    } finally {<a name="line.540"></a>
-<span class="sourceLineNo">541</span>      System.setErr(oldPrintStream);<a name="line.541"></a>
-<span class="sourceLineNo">542</span>      System.setSecurityManager(SECURITY_MANAGER);<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><a name="line.545"></a>
-<span class="sourceLineNo">546</span>  /**<a name="line.546"></a>
-<span class="sourceLineNo">547</span>   * test main method. Export should print help and call System.exit<a name="line.547"></a>
-<span class="sourceLineNo">548</span>   */<a name="line.548"></a>
-<span class="sourceLineNo">549</span>  @Test<a name="line.549"></a>
-<span class="sourceLineNo">550</span>  public void testExportMain() throws Exception {<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    PrintStream oldPrintStream = System.err;<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    SecurityManager SECURITY_MANAGER = System.getSecurityManager();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    LauncherSecurityManager newSecurityManager= new LauncherSecurityManager();<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    System.setSecurityManager(newSecurityManager);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    ByteArrayOutputStream data = new ByteArrayOutputStream();<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    String[] args = {};<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    System.setErr(new PrintStream(data));<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    try {<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      System.setErr(new PrintStream(data));<a name="line.559"></a>
-<span class="sourceLineNo">560</span>      Export.main(args);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>      fail("should be SecurityException");<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    } catch (SecurityException e) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      assertEquals(-1, newSecurityManager.getExitCode());<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      assertTrue(data.toString().contains("Wrong number of arguments:"));<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      assertTrue(data.toString().contains(<a name="line.565"></a>
-<span class="sourceLineNo">566</span>              "Usage: Export [-D &lt;property=value&gt;]* &lt;tablename&gt; &lt;outputdir&gt; [&lt;versions&gt; " +<a name="line.566"></a>
-<span class="sourceLineNo">567</span>              "[&lt;starttime&gt; [&lt;endtime&gt;]] [^[regex pattern] or [Prefix] to filter]]"));<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      assertTrue(data.toString().contains("-D hbase.mapreduce.scan.column.family=&lt;familyName&gt;"));<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      assertTrue(data.toString().contains("-D hbase.mapreduce.include.deleted.rows=true"));<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      assertTrue(data.toString().contains("-Dhbase.client.scanner.caching=100"));<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      assertTrue(data.toString().contains("-Dmapreduce.map.speculative=false"));<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      assertTrue(data.toString().contains("-Dmapreduce.reduce.speculative=false"));<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      assertTrue(data.toString().contains("-Dhbase.export.scanner.batch=10"));<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    } finally {<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      System.setErr(oldPrintStream);<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      System.setSecurityManager(SECURITY_MANAGER);<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    }<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>  /**<a name="line.580"></a>
-<span class="sourceLineNo">581</span>   * Test map method of Importer<a name="line.581"></a>
-<span class="sourceLineNo">582</span>   */<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  @Test<a name="line.584"></a>
-<span class="sourceLineNo">585</span>  public void testKeyValueImporter() throws Exception {<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    KeyValueImporter importer = new KeyValueImporter();<a name="line.586"></a>
-<span class="sourceLineNo">587</span>    Configuration configuration = new Configuration();<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    Context ctx = mock(Context.class);<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    when(ctx.getConfiguration()).thenReturn(configuration);<a name="line.589"></a>
+<span class="sourceLineNo">537</span>      assertTrue(data.toString().contains("-Dmapreduce.reduce.speculative=false"));<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    } finally {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      System.setErr(oldPrintStream);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      System.setSecurityManager(SECURITY_MANAGER);<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>   * test main method. Export should print help and call System.exit<a name="line.545"></a>
+<span class="sourceLineNo">546</span>   */<a name="line.546"></a>
+<span class="sourceLineNo">547</span>  @Test<a name="line.547"></a>
+<span class="sourceLineNo">548</span>  public void testExportMain() throws Exception {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    PrintStream oldPrintStream = System.err;<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    SecurityManager SECURITY_MANAGER = System.getSecurityManager();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    LauncherSecurityManager newSecurityManager= new LauncherSecurityManager();<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    System.setSecurityManager(newSecurityManager);<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    ByteArrayOutputStream data = new ByteArrayOutputStream();<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    String[] args = {};<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    System.setErr(new PrintStream(data));<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    try {<a name="line.556"></a>
+<span class="sourceLineNo">557</span>      System.setErr(new PrintStream(data));<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      Export.main(args);<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      fail("should be SecurityException");<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    } catch (SecurityException e) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      assertEquals(-1, newSecurityManager.getExitCode());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      assertTrue(data.toString().contains("Wrong number of arguments:"));<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      assertTrue(data.toString().contains(<a name="line.563"></a>
+<span class="sourceLineNo">564</span>              "Usage: Export [-D &lt;property=value&gt;]* &lt;tablename&gt; &lt;outputdir&gt; [&lt;versions&gt; " +<a name="line.564"></a>
+<span class="sourceLineNo">565</span>              "[&lt;starttime&gt; [&lt;endtime&gt;]] [^[regex pattern] or [Prefix] to filter]]"));<a name="line.565"></a>
+<span class="sourceLineNo">566</span>      assertTrue(data.toString().contains("-D hbase.mapreduce.scan.column.family=&lt;familyName&gt;"));<a name="line.566"></a>
+<span class="sourceLineNo">567</span>      assertTrue(data.toString().contains("-D hbase.mapreduce.include.deleted.rows=true"));<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      assertTrue(data.toString().contains("-Dhbase.client.scanner.caching=100"));<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      assertTrue(data.toString().contains("-Dmapreduce.map.speculative=false"));<a name="line.569"></a>
+<span class="sourceLineNo">570</span>      assertTrue(data.toString().contains("-Dmapreduce.reduce.speculative=false"));<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      assertTrue(data.toString().contains("-Dhbase.export.scanner.batch=10"));<a name="line.571"></a>
+<span class="sourceLineNo">572</span>    } finally {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>      System.setErr(oldPrintStream);<a name="line.573"></a>
+<span class="sourceLineNo">574</span>      System.setSecurityManager(SECURITY_MANAGER);<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><a name="line.577"></a>
+<span class="sourceLineNo">578</span>  /**<a name="line.578"></a>
+<span class="sourceLineNo">579</span>   * Test map method of Importer<a name="line.579"></a>
+<span class="sourceLineNo">580</span>   */<a name="line.580"></a>
+<span class="sourceLineNo">581</span>  @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.581"></a>
+<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
+<span class="sourceLineNo">583</span>  public void testKeyValueImporter() throws Exception {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    KeyValueImporter importer = new KeyValueImporter();<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    Configuration configuration = new Configuration();<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    Context ctx = mock(Context.class);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>    when(ctx.getConfiguration()).thenReturn(configuration);<a name="line.587"></a>
+<span class="sourceLineNo">588</span><a name="line.588"></a>
+<span class="sourceLineNo">589</span>    doAnswer(new Answer&lt;Void&gt;() {<a name="line.589"></a>
 <span class="sourceLineNo">590</span><a name="line.590"></a>
-<span class="sourceLineNo">591</span>    doAnswer(new Answer&lt;Void&gt;() {<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span>      @Override<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      public Void answer(InvocationOnMock invocation) throws Throwable {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>        ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArguments()[0];<a name="line.595"></a>
-<span class="sourceLineNo">596</span>        KeyValue key = (KeyValue) invocation.getArguments()[1];<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        assertEquals("Key", Bytes.toString(writer.get()));<a name="line.597"></a>
-<span class="sourceLineNo">598</span>        assertEquals("row", Bytes.toString(CellUtil.cloneRow(key)));<a name="line.598"></a>
-<span class="sourceLineNo">599</span>        return null;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    }).when(ctx).write(any(ImmutableBytesWritable.class), any(KeyValue.class));<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>    importer.setup(ctx);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    Result value = mock(Result.class);<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    KeyValue[] keys = {<a name="line.605"></a>
+<span class="sourceLineNo">591</span>      @Override<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      public Void answer(InvocationOnMock invocation) throws Throwable {<a name="line.592"></a>
+<span class="sourceLineNo">593</span>        ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArguments()[0];<a name="line.593"></a>
+<span class="sourceLineNo">594</span>        KeyValue key = (KeyValue) invocation.getArguments()[1];<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        assertEquals("Key", Bytes.toString(writer.get()));<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        assertEquals("row", Bytes.toString(CellUtil.cloneRow(key)));<a name="line.596"></a>
+<span class="sourceLineNo">597</span>        return null;<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      }<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    }).when(ctx).write(any(ImmutableBytesWritable.class), any(KeyValue.class));<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span>    importer.setup(ctx);<a name="line.601"></a>
+<span class="sourceLineNo">602</span>    Result value = mock(Result.class);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>    KeyValue[] keys = {<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        new KeyValue(Bytes.toBytes("row"), Bytes.toBytes("family"), Bytes.toBytes("qualifier"),<a name="line.604"></a>
+<span class="sourceLineNo">605</span>            Bytes.toBytes("value")),<a name="line.605"></a>
 <span class="sourceLineNo">606</span>        new KeyValue(Bytes.toBytes("row"), Bytes.toBytes("family"), Bytes.toBytes("qualifier"),<a name="line.606"></a>
-<span class="sourceLineNo">607</span>            Bytes.toBytes("value")),<a name="line.607"></a>
-<span class="sourceLineNo">608</span>        new KeyValue(Bytes.toBytes("row"), Bytes.toBytes("family"), Bytes.toBytes("qualifier"),<a name="line.608"></a>
-<span class="sourceLineNo">609</span>            Bytes.toBytes("value1")) };<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    when(value.rawCells()).thenReturn(keys);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    importer.map(new ImmutableBytesWritable(Bytes.toBytes("Key")), value, ctx);<a name="line.611"></a>
+<span class="sourceLineNo">607</span>            Bytes.toBytes("value1")) };<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    when(value.rawCells()).thenReturn(keys);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    importer.map(new ImmutableBytesWritable(Bytes.toBytes("Key")), value, ctx);<a name="line.609"></a>
+<span class="sourceLineNo">610</span><a name="line.610"></a>
+<span class="sourceLineNo">611</span>  }<a name="line.611"></a>
 <span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>  }<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>  /**<a name="line.615"></a>
-<span class="sourceLineNo">616</span>   * Test addFilterAndArguments method of Import This method set couple<a name="line.616"></a>
-<span class="sourceLineNo">617</span>   * parameters into Configuration<a name="line.617"></a>
-<span class="sourceLineNo">618</span>   */<a name="line.618"></a>
-<span class="sourceLineNo">619</span>  @Test<a name="line.619"></a>
-<span class="sourceLineNo">620</span>  public void testAddFilterAndArguments() throws IOException {<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    Configuration configuration = new Configuration();<a name="line.621"></a>
-<span class="sourceLineNo">622</span><a name="line.622"></a>
-<span class="sourceLineNo">623</span>    List&lt;String&gt; args = new ArrayList&lt;String&gt;();<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    args.add("param1");<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    args.add("param2");<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span>    Import.addFilterAndArguments(configuration, FilterBase.class, args);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    assertEquals("org.apache.hadoop.hbase.filter.FilterBase",<a name="line.628"></a>
-<span class="sourceLineNo">629</span>        configuration.get(Import.FILTER_CLASS_CONF_KEY));<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    assertEquals("param1,param2", configuration.get(Import.FILTER_ARGS_CONF_KEY));<a name="line.630"></a>
-<span class="sourceLineNo">631</span>  }<a name="line.631"></a>
-<span class="sourceLineNo">632</span><a name="line.632"></a>
-<span class="sourceLineNo">633</span>  @Test<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  public void testDurability() throws Exception {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    // Create an export table.<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    String exportTableName = "exporttestDurability";<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    Table exportTable = UTIL.createTable(TableName.valueOf(exportTableName), FAMILYA, 3);<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>    // Insert some data<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    Put put = new Put(ROW1);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    put.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    put.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    put.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    exportTable.put(put);<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span>    put = new Put(ROW2);<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    put.addColumn(FAMILYA, QUAL, now, QUAL);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    put.addColumn(FAMILYA, QUAL, now + 1, QUAL);<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    put.addColumn(FAMILYA, QUAL, now + 2, QUAL);<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    exportTable.put(put);<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>    // Run the export<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    String[] args = new String[] { exportTableName, FQ_OUTPU

<TRUNCATED>

Mime
View raw message