http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c635e71b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide.html
index 7d32ed2..293c833 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide.html
@@ -1435,4908 +1435,5004 @@
 <span class="sourceLineNo">1427</span>  }<a name="line.1427"></a>
 <span class="sourceLineNo">1428</span><a name="line.1428"></a>
 <span class="sourceLineNo">1429</span>  @Test<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span>  public void testVersions() throws 
Exception {<a name="line.1430"></a>
+<span class="sourceLineNo">1430</span>  public void testNullQualifier() throws 
Exception {<a name="line.1430"></a>
 <span class="sourceLineNo">1431</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span><a name="line.1432"></a>
-<span class="sourceLineNo">1433</span>    long [] STAMPS = makeStamps(20);<a 
name="line.1433"></a>
-<span class="sourceLineNo">1434</span>    byte [][] VALUES = makeNAscii(VALUE, 
20);<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span><a name="line.1435"></a>
-<span class="sourceLineNo">1436</span>    Table ht = 
TEST_UTIL.createTable(tableName, FAMILY, 10);<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span><a name="line.1437"></a>
-<span class="sourceLineNo">1438</span>    // Insert 4 versions of same 
column<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span>    Put put = new Put(ROW);<a 
name="line.1439"></a>
-<span class="sourceLineNo">1440</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[1], VALUES[1]);<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[2], VALUES[2]);<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[4], VALUES[4]);<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[5], VALUES[5]);<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span>    ht.put(put);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span><a name="line.1445"></a>
-<span class="sourceLineNo">1446</span>    // Verify we can get each one 
properly<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span><a name="line.1455"></a>
-<span class="sourceLineNo">1456</span>    // Verify we don't accidentally get 
others<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1462"></a>
-<span class="sourceLineNo">1463</span><a name="line.1463"></a>
-<span class="sourceLineNo">1464</span>    // Ensure maxVersions in query is 
respected<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span>    Get get = new Get(ROW);<a 
name="line.1465"></a>
-<span class="sourceLineNo">1466</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1466"></a>
-<span class="sourceLineNo">1467</span>    get.setMaxVersions(2);<a 
name="line.1467"></a>
-<span class="sourceLineNo">1468</span>    Result result = ht.get(get);<a 
name="line.1468"></a>
-<span class="sourceLineNo">1469</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1471"></a>
-<span class="sourceLineNo">1472</span>        0, 1);<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span><a name="line.1473"></a>
-<span class="sourceLineNo">1474</span>    Scan scan = new Scan(ROW);<a 
name="line.1474"></a>
-<span class="sourceLineNo">1475</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1475"></a>
-<span class="sourceLineNo">1476</span>    scan.setMaxVersions(2);<a 
name="line.1476"></a>
-<span class="sourceLineNo">1477</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1480"></a>
-<span class="sourceLineNo">1481</span>        0, 1);<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span><a name="line.1482"></a>
-<span class="sourceLineNo">1483</span>    // Flush and redo<a 
name="line.1483"></a>
+<span class="sourceLineNo">1432</span>    Table table = 
TEST_UTIL.createTable(tableName, FAMILY);<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span><a name="line.1433"></a>
+<span class="sourceLineNo">1434</span>    // Work for Put<a 
name="line.1434"></a>
+<span class="sourceLineNo">1435</span>    Put put = new Put(ROW);<a 
name="line.1435"></a>
+<span class="sourceLineNo">1436</span>    put.addColumn(FAMILY, null, 
VALUE);<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span>    table.put(put);<a 
name="line.1437"></a>
+<span class="sourceLineNo">1438</span><a name="line.1438"></a>
+<span class="sourceLineNo">1439</span>    // Work for Get, Scan<a 
name="line.1439"></a>
+<span class="sourceLineNo">1440</span>    getTestNull(table, ROW, FAMILY, 
VALUE);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span>    scanTestNull(table, ROW, FAMILY, 
VALUE);<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span><a name="line.1442"></a>
+<span class="sourceLineNo">1443</span>    // Work for Delete<a 
name="line.1443"></a>
+<span class="sourceLineNo">1444</span>    Delete delete = new Delete(ROW);<a 
name="line.1444"></a>
+<span class="sourceLineNo">1445</span>    delete.addColumns(FAMILY, null);<a 
name="line.1445"></a>
+<span class="sourceLineNo">1446</span>    table.delete(delete);<a 
name="line.1446"></a>
+<span class="sourceLineNo">1447</span><a name="line.1447"></a>
+<span class="sourceLineNo">1448</span>    Get get = new Get(ROW);<a 
name="line.1448"></a>
+<span class="sourceLineNo">1449</span>    Result result = table.get(get);<a 
name="line.1449"></a>
+<span class="sourceLineNo">1450</span>    assertEmptyResult(result);<a 
name="line.1450"></a>
+<span class="sourceLineNo">1451</span><a name="line.1451"></a>
+<span class="sourceLineNo">1452</span>    // Work for Increment/Append<a 
name="line.1452"></a>
+<span class="sourceLineNo">1453</span>    Increment increment = new 
Increment(ROW);<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span>    increment.addColumn(FAMILY, null, 
1L);<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span>    table.increment(increment);<a 
name="line.1455"></a>
+<span class="sourceLineNo">1456</span>    getTestNull(table, ROW, FAMILY, 
1L);<a name="line.1456"></a>
+<span class="sourceLineNo">1457</span><a name="line.1457"></a>
+<span class="sourceLineNo">1458</span>    table.incrementColumnValue(ROW, 
FAMILY, null, 1L);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span>    getTestNull(table, ROW, FAMILY, 
2L);<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span><a name="line.1460"></a>
+<span class="sourceLineNo">1461</span>    delete = new Delete(ROW);<a 
name="line.1461"></a>
+<span class="sourceLineNo">1462</span>    delete.addColumns(FAMILY, null);<a 
name="line.1462"></a>
+<span class="sourceLineNo">1463</span>    table.delete(delete);<a 
name="line.1463"></a>
+<span class="sourceLineNo">1464</span><a name="line.1464"></a>
+<span class="sourceLineNo">1465</span>    Append append = new Append(ROW);<a 
name="line.1465"></a>
+<span class="sourceLineNo">1466</span>    append.add(FAMILY, null, VALUE);<a 
name="line.1466"></a>
+<span class="sourceLineNo">1467</span>    table.append(append);<a 
name="line.1467"></a>
+<span class="sourceLineNo">1468</span>    getTestNull(table, ROW, FAMILY, 
VALUE);<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span><a name="line.1469"></a>
+<span class="sourceLineNo">1470</span>    // Work for checkAndMutate, 
checkAndPut, checkAndDelete<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span>    put = new Put(ROW);<a 
name="line.1471"></a>
+<span class="sourceLineNo">1472</span>    put.addColumn(FAMILY, null, 
Bytes.toBytes("checkAndPut"));<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span>    table.put(put);<a 
name="line.1473"></a>
+<span class="sourceLineNo">1474</span>    table.checkAndPut(ROW, FAMILY, null, 
VALUE, put);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span><a name="line.1475"></a>
+<span class="sourceLineNo">1476</span>    RowMutations mutate = new 
RowMutations(ROW);<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span>    mutate.add(new 
Put(ROW).addColumn(FAMILY, null, Bytes.toBytes("checkAndMutate")));<a 
name="line.1477"></a>
+<span class="sourceLineNo">1478</span>    table.checkAndMutate(ROW, FAMILY, 
null, CompareOp.EQUAL, Bytes.toBytes("checkAndPut"), mutate);<a 
name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span>    delete = new Delete(ROW);<a 
name="line.1480"></a>
+<span class="sourceLineNo">1481</span>    delete.addColumns(FAMILY, null);<a 
name="line.1481"></a>
+<span class="sourceLineNo">1482</span>    table.checkAndDelete(ROW, FAMILY, 
null, Bytes.toBytes("checkAndMutate"), delete);<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span>  }<a name="line.1483"></a>
 <span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span>    TEST_UTIL.flush();<a 
name="line.1485"></a>
-<span class="sourceLineNo">1486</span><a name="line.1486"></a>
-<span class="sourceLineNo">1487</span>    // Verify we can get each one 
properly<a name="line.1487"></a>
-<span class="sourceLineNo">1488</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1488"></a>
-<span class="sourceLineNo">1489</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1491"></a>
-<span class="sourceLineNo">1492</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1492"></a>
-<span class="sourceLineNo">1493</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1493"></a>
-<span class="sourceLineNo">1494</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span><a name="line.1496"></a>
-<span class="sourceLineNo">1497</span>    // Verify we don't accidentally get 
others<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1499"></a>
-<span class="sourceLineNo">1500</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span><a name="line.1504"></a>
-<span class="sourceLineNo">1505</span>    // Ensure maxVersions in query is 
respected<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span>    get = new Get(ROW);<a 
name="line.1506"></a>
-<span class="sourceLineNo">1507</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1507"></a>
-<span class="sourceLineNo">1508</span>    get.setMaxVersions(2);<a 
name="line.1508"></a>
-<span class="sourceLineNo">1509</span>    result = ht.get(get);<a 
name="line.1509"></a>
-<span class="sourceLineNo">1510</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span>        0, 1);<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span><a name="line.1514"></a>
-<span class="sourceLineNo">1515</span>    scan = new Scan(ROW);<a 
name="line.1515"></a>
-<span class="sourceLineNo">1516</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1516"></a>
-<span class="sourceLineNo">1517</span>    scan.setMaxVersions(2);<a 
name="line.1517"></a>
-<span class="sourceLineNo">1518</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1518"></a>
-<span class="sourceLineNo">1519</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span>        0, 1);<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span><a name="line.1523"></a>
-<span class="sourceLineNo">1524</span><a name="line.1524"></a>
-<span class="sourceLineNo">1525</span>    // Add some memstore and retest<a 
name="line.1525"></a>
-<span class="sourceLineNo">1526</span><a name="line.1526"></a>
-<span class="sourceLineNo">1527</span>    // Insert 4 more versions of same 
column and a dupe<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span>    put = new Put(ROW);<a 
name="line.1528"></a>
-<span class="sourceLineNo">1529</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[3], VALUES[3]);<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[6], VALUES[6]);<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[7], VALUES[7]);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[8], VALUES[8]);<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span>    ht.put(put);<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span>    // Ensure maxVersions in query is 
respected<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span>    get = new Get(ROW);<a 
name="line.1536"></a>
-<span class="sourceLineNo">1537</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1537"></a>
-<span class="sourceLineNo">1538</span>    get.setMaxVersions();<a 
name="line.1538"></a>
-<span class="sourceLineNo">1539</span>    result = ht.get(get);<a 
name="line.1539"></a>
-<span class="sourceLineNo">1540</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1541"></a>
-<span class="sourceLineNo">1542</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1542"></a>
-<span class="sourceLineNo">1543</span>        0, 7);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span><a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>    scan = new Scan(ROW);<a 
name="line.1545"></a>
-<span class="sourceLineNo">1546</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1546"></a>
-<span class="sourceLineNo">1547</span>    scan.setMaxVersions();<a 
name="line.1547"></a>
-<span class="sourceLineNo">1548</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1550"></a>
-<span class="sourceLineNo">1551</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1551"></a>
-<span class="sourceLineNo">1552</span>        0, 7);<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span><a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>    get = new Get(ROW);<a 
name="line.1554"></a>
-<span class="sourceLineNo">1555</span>    get.setMaxVersions();<a 
name="line.1555"></a>
-<span class="sourceLineNo">1556</span>    result = ht.get(get);<a 
name="line.1556"></a>
-<span class="sourceLineNo">1557</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1558"></a>
-<span class="sourceLineNo">1559</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1559"></a>
-<span class="sourceLineNo">1560</span>        0, 7);<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span><a name="line.1561"></a>
-<span class="sourceLineNo">1562</span>    scan = new Scan(ROW);<a 
name="line.1562"></a>
-<span class="sourceLineNo">1563</span>    scan.setMaxVersions();<a 
name="line.1563"></a>
-<span class="sourceLineNo">1564</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1566"></a>
-<span class="sourceLineNo">1567</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1567"></a>
-<span class="sourceLineNo">1568</span>        0, 7);<a name="line.1568"></a>
-<span class="sourceLineNo">1569</span><a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>    // Verify we can get each one 
properly<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[7], VALUES[7]);<a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1575"></a>
-<span class="sourceLineNo">1576</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[7], VALUES[7]);<a name="line.1578"></a>
+<span class="sourceLineNo">1485</span>  @Test<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span>  public void testVersions() throws 
Exception {<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.1487"></a>
+<span class="sourceLineNo">1488</span><a name="line.1488"></a>
+<span class="sourceLineNo">1489</span>    long [] STAMPS = makeStamps(20);<a 
name="line.1489"></a>
+<span class="sourceLineNo">1490</span>    byte [][] VALUES = makeNAscii(VALUE, 
20);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span><a name="line.1491"></a>
+<span class="sourceLineNo">1492</span>    Table ht = 
TEST_UTIL.createTable(tableName, FAMILY, 10);<a name="line.1492"></a>
+<span class="sourceLineNo">1493</span><a name="line.1493"></a>
+<span class="sourceLineNo">1494</span>    // Insert 4 versions of same 
column<a name="line.1494"></a>
+<span class="sourceLineNo">1495</span>    Put put = new Put(ROW);<a 
name="line.1495"></a>
+<span class="sourceLineNo">1496</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[1], VALUES[1]);<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[2], VALUES[2]);<a name="line.1497"></a>
+<span class="sourceLineNo">1498</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[4], VALUES[4]);<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[5], VALUES[5]);<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span>    ht.put(put);<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span>    // Verify we can get each one 
properly<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1505"></a>
+<span class="sourceLineNo">1506</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1510"></a>
+<span class="sourceLineNo">1511</span><a name="line.1511"></a>
+<span class="sourceLineNo">1512</span>    // Verify we don't accidentally get 
others<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1516"></a>
+<span class="sourceLineNo">1517</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span><a name="line.1519"></a>
+<span class="sourceLineNo">1520</span>    // Ensure maxVersions in query is 
respected<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span>    Get get = new Get(ROW);<a 
name="line.1521"></a>
+<span class="sourceLineNo">1522</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1522"></a>
+<span class="sourceLineNo">1523</span>    get.setMaxVersions(2);<a 
name="line.1523"></a>
+<span class="sourceLineNo">1524</span>    Result result = ht.get(get);<a 
name="line.1524"></a>
+<span class="sourceLineNo">1525</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1526"></a>
+<span class="sourceLineNo">1527</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span>        0, 1);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span><a name="line.1529"></a>
+<span class="sourceLineNo">1530</span>    Scan scan = new Scan(ROW);<a 
name="line.1530"></a>
+<span class="sourceLineNo">1531</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1531"></a>
+<span class="sourceLineNo">1532</span>    scan.setMaxVersions(2);<a 
name="line.1532"></a>
+<span class="sourceLineNo">1533</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1535"></a>
+<span class="sourceLineNo">1536</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span>        0, 1);<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span><a name="line.1538"></a>
+<span class="sourceLineNo">1539</span>    // Flush and redo<a 
name="line.1539"></a>
+<span class="sourceLineNo">1540</span><a name="line.1540"></a>
+<span class="sourceLineNo">1541</span>    TEST_UTIL.flush();<a 
name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span>    // Verify we can get each one 
properly<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span><a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>    // Verify we don't accidentally get 
others<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[3]);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[6]);<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span><a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>    // Ensure maxVersions in query is 
respected<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>    get = new Get(ROW);<a 
name="line.1562"></a>
+<span class="sourceLineNo">1563</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1563"></a>
+<span class="sourceLineNo">1564</span>    get.setMaxVersions(2);<a 
name="line.1564"></a>
+<span class="sourceLineNo">1565</span>    result = ht.get(get);<a 
name="line.1565"></a>
+<span class="sourceLineNo">1566</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span>        0, 1);<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span><a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>    scan = new Scan(ROW);<a 
name="line.1571"></a>
+<span class="sourceLineNo">1572</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1572"></a>
+<span class="sourceLineNo">1573</span>    scan.setMaxVersions(2);<a 
name="line.1573"></a>
+<span class="sourceLineNo">1574</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span>        new long [] {STAMPS[4], 
STAMPS[5]},<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span>        new byte[][] {VALUES[4], 
VALUES[5]},<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span>        0, 1);<a name="line.1578"></a>
 <span class="sourceLineNo">1579</span><a name="line.1579"></a>
-<span class="sourceLineNo">1580</span>    // Verify we don't accidentally get 
others<a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[9]);<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[9]);<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span><a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>    // Ensure maxVersions of table is 
respected<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span><a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>    TEST_UTIL.flush();<a 
name="line.1588"></a>
-<span class="sourceLineNo">1589</span><a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>    // Insert 4 more versions of same 
column and a dupe<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>    put = new Put(ROW);<a 
name="line.1591"></a>
-<span class="sourceLineNo">1592</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[9], VALUES[9]);<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[11], VALUES[11]);<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[13], VALUES[13]);<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[15], VALUES[15]);<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>    ht.put(put);<a name="line.1596"></a>
-<span class="sourceLineNo">1597</span><a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>    get = new Get(ROW);<a 
name="line.1598"></a>
-<span class="sourceLineNo">1599</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1599"></a>
-<span class="sourceLineNo">1600</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>    result = ht.get(get);<a 
name="line.1601"></a>
-<span class="sourceLineNo">1602</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span>        new long [] {STAMPS[3], 
STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8], STAMPS[9], STAMPS[11], 
STAMPS[13], STAMPS[15]},<a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>        new byte[][] {VALUES[3], 
VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8], VALUES[9], VALUES[11], 
VALUES[13], VALUES[15]},<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>        0, 9);<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span><a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>    scan = new Scan(ROW);<a 
name="line.1607"></a>
-<span class="sourceLineNo">1608</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1608"></a>
-<span class="sourceLineNo">1609</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>        new long [] {STAMPS[3], 
STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8], STAMPS[9], STAMPS[11], 
STAMPS[13], STAMPS[15]},<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>        new byte[][] {VALUES[3], 
VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8], VALUES[9], VALUES[11], 
VALUES[13], VALUES[15]},<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>        0, 9);<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span><a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>    // Delete a version in the memstore 
and a version in a storefile<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>    Delete delete = new Delete(ROW);<a 
name="line.1617"></a>
-<span class="sourceLineNo">1618</span>    delete.addColumn(FAMILY, QUALIFIER, 
STAMPS[11]);<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>    delete.addColumn(FAMILY, QUALIFIER, 
STAMPS[7]);<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>    ht.delete(delete);<a 
name="line.1620"></a>
-<span class="sourceLineNo">1621</span><a name="line.1621"></a>
-<span class="sourceLineNo">1622</span>    // Test that it's gone<a 
name="line.1622"></a>
-<span class="sourceLineNo">1623</span>    get = new Get(ROW);<a 
name="line.1623"></a>
-<span class="sourceLineNo">1624</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1624"></a>
-<span class="sourceLineNo">1625</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    result = ht.get(get);<a 
name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[8], STAMPS[9], 
STAMPS[13], STAMPS[15]},<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[8], VALUES[9], 
VALUES[13], VALUES[15]},<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>        0, 9);<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span><a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>    scan = new Scan(ROW);<a 
name="line.1632"></a>
-<span class="sourceLineNo">1633</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1633"></a>
-<span class="sourceLineNo">1634</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[8], STAMPS[9], 
STAMPS[13], STAMPS[15]},<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[8], VALUES[9], 
VALUES[13], VALUES[15]},<a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>        0, 9);<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>  @Test<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>  public void testVersionLimits() throws 
Exception {<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    byte [][] FAMILIES = 
makeNAscii(FAMILY, 3);<a name="line.1646"></a>
-<span class="sourceLineNo">1647</span>    int [] LIMITS = {1,3,5};<a 
name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    long [] STAMPS = makeStamps(10);<a 
name="line.1648"></a>
-<span class="sourceLineNo">1649</span>    byte [][] VALUES = makeNAscii(VALUE, 
10);<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>    Table ht = 
TEST_UTIL.createTable(tableName, FAMILIES, LIMITS);<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span><a name="line.1651"></a>
-<span class="sourceLineNo">1652</span>    // Insert limit + 1 on each family<a 
name="line.1652"></a>
-<span class="sourceLineNo">1653</span>    Put put = new Put(ROW);<a 
name="line.1653"></a>
-<span class="sourceLineNo">1654</span>    put.addColumn(FAMILIES[0], 
QUALIFIER, STAMPS[0], VALUES[0]);<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span>    put.addColumn(FAMILIES[0], 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[0], VALUES[0]);<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[3], VALUES[3]);<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[0], VALUES[0]);<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[3], VALUES[3]);<a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[6], VALUES[6]);<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span>    ht.put(put);<a name="line.1667"></a>
-<span class="sourceLineNo">1668</span><a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>    // Verify we only get the right 
number out of each<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span><a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>    // Family0<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span><a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>    Get get = new Get(ROW);<a 
name="line.1673"></a>
-<span class="sourceLineNo">1674</span>    get.addColumn(FAMILIES[0], 
QUALIFIER);<a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>    Result result = ht.get(get);<a 
name="line.1676"></a>
-<span class="sourceLineNo">1677</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>        new long [] {STAMPS[1]},<a 
name="line.1678"></a>
-<span class="sourceLineNo">1679</span>        new byte[][] {VALUES[1]},<a 
name="line.1679"></a>
-<span class="sourceLineNo">1680</span>        0, 0);<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span><a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>    get = new Get(ROW);<a 
name="line.1682"></a>
-<span class="sourceLineNo">1683</span>    get.addFamily(FAMILIES[0]);<a 
name="line.1683"></a>
-<span class="sourceLineNo">1684</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>    result = ht.get(get);<a 
name="line.1685"></a>
-<span class="sourceLineNo">1686</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>        new long [] {STAMPS[1]},<a 
name="line.1687"></a>
-<span class="sourceLineNo">1688</span>        new byte[][] {VALUES[1]},<a 
name="line.1688"></a>
-<span class="sourceLineNo">1689</span>        0, 0);<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span><a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>    Scan scan = new Scan(ROW);<a 
name="line.1691"></a>
-<span class="sourceLineNo">1692</span>    scan.addColumn(FAMILIES[0], 
QUALIFIER);<a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>        new long [] {STAMPS[1]},<a 
name="line.1696"></a>
-<span class="sourceLineNo">1697</span>        new byte[][] {VALUES[1]},<a 
name="line.1697"></a>
-<span class="sourceLineNo">1698</span>        0, 0);<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span><a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>    scan = new Scan(ROW);<a 
name="line.1700"></a>
-<span class="sourceLineNo">1701</span>    scan.addFamily(FAMILIES[0]);<a 
name="line.1701"></a>
-<span class="sourceLineNo">1702</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>        new long [] {STAMPS[1]},<a 
name="line.1705"></a>
-<span class="sourceLineNo">1706</span>        new byte[][] {VALUES[1]},<a 
name="line.1706"></a>
-<span class="sourceLineNo">1707</span>        0, 0);<a name="line.1707"></a>
-<span class="sourceLineNo">1708</span><a name="line.1708"></a>
-<span class="sourceLineNo">1709</span>    // Family1<a name="line.1709"></a>
-<span class="sourceLineNo">1710</span><a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>    get = new Get(ROW);<a 
name="line.1711"></a>
-<span class="sourceLineNo">1712</span>    get.addColumn(FAMILIES[1], 
QUALIFIER);<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    result = ht.get(get);<a 
name="line.1714"></a>
-<span class="sourceLineNo">1715</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1717"></a>
-<span class="sourceLineNo">1718</span>        0, 2);<a name="line.1718"></a>
-<span class="sourceLineNo">1719</span><a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>    get = new Get(ROW);<a 
name="line.1720"></a>
-<span class="sourceLineNo">1721</span>    get.addFamily(FAMILIES[1]);<a 
name="line.1721"></a>
-<span class="sourceLineNo">1722</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span>    result = ht.get(get);<a 
name="line.1723"></a>
-<span class="sourceLineNo">1724</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span>        0, 2);<a name="line.1727"></a>
+<span class="sourceLineNo">1580</span><a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>    // Add some memstore and retest<a 
name="line.1581"></a>
+<span class="sourceLineNo">1582</span><a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>    // Insert 4 more versions of same 
column and a dupe<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>    put = new Put(ROW);<a 
name="line.1584"></a>
+<span class="sourceLineNo">1585</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[3], VALUES[3]);<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[6], VALUES[6]);<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[7], VALUES[7]);<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[8], VALUES[8]);<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>    ht.put(put);<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span><a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>    // Ensure maxVersions in query is 
respected<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>    get = new Get(ROW);<a 
name="line.1592"></a>
+<span class="sourceLineNo">1593</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1593"></a>
+<span class="sourceLineNo">1594</span>    get.setMaxVersions();<a 
name="line.1594"></a>
+<span class="sourceLineNo">1595</span>    result = ht.get(get);<a 
name="line.1595"></a>
+<span class="sourceLineNo">1596</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1597"></a>
+<span class="sourceLineNo">1598</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1598"></a>
+<span class="sourceLineNo">1599</span>        0, 7);<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span><a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>    scan = new Scan(ROW);<a 
name="line.1601"></a>
+<span class="sourceLineNo">1602</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1602"></a>
+<span class="sourceLineNo">1603</span>    scan.setMaxVersions();<a 
name="line.1603"></a>
+<span class="sourceLineNo">1604</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1606"></a>
+<span class="sourceLineNo">1607</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1607"></a>
+<span class="sourceLineNo">1608</span>        0, 7);<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span><a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>    get = new Get(ROW);<a 
name="line.1610"></a>
+<span class="sourceLineNo">1611</span>    get.setMaxVersions();<a 
name="line.1611"></a>
+<span class="sourceLineNo">1612</span>    result = ht.get(get);<a 
name="line.1612"></a>
+<span class="sourceLineNo">1613</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1614"></a>
+<span class="sourceLineNo">1615</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1615"></a>
+<span class="sourceLineNo">1616</span>        0, 7);<a name="line.1616"></a>
+<span class="sourceLineNo">1617</span><a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>    scan = new Scan(ROW);<a 
name="line.1618"></a>
+<span class="sourceLineNo">1619</span>    scan.setMaxVersions();<a 
name="line.1619"></a>
+<span class="sourceLineNo">1620</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8]},<a 
name="line.1622"></a>
+<span class="sourceLineNo">1623</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8]},<a 
name="line.1623"></a>
+<span class="sourceLineNo">1624</span>        0, 7);<a name="line.1624"></a>
+<span class="sourceLineNo">1625</span><a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>    // Verify we can get each one 
properly<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>    getVersionAndVerify(ht, ROW, FAMILY, 
QUALIFIER, STAMPS[7], VALUES[7]);<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>    scanVersionAndVerify(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[7], VALUES[7]);<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span><a name="line.1635"></a>
+<span class="sourceLineNo">1636</span>    // Verify we don't accidentally get 
others<a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    getVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[9]);<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[0]);<a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    scanVersionAndVerifyMissing(ht, ROW, 
FAMILY, QUALIFIER, STAMPS[9]);<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span><a name="line.1641"></a>
+<span class="sourceLineNo">1642</span>    // Ensure maxVersions of table is 
respected<a name="line.1642"></a>
+<span class="sourceLineNo">1643</span><a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>    TEST_UTIL.flush();<a 
name="line.1644"></a>
+<span class="sourceLineNo">1645</span><a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>    // Insert 4 more versions of same 
column and a dupe<a name="line.1646"></a>
+<span class="sourceLineNo">1647</span>    put = new Put(ROW);<a 
name="line.1647"></a>
+<span class="sourceLineNo">1648</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[9], VALUES[9]);<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[11], VALUES[11]);<a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[13], VALUES[13]);<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>    put.addColumn(FAMILY, QUALIFIER, 
STAMPS[15], VALUES[15]);<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>    ht.put(put);<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span><a name="line.1653"></a>
+<span class="sourceLineNo">1654</span>    get = new Get(ROW);<a 
name="line.1654"></a>
+<span class="sourceLineNo">1655</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1655"></a>
+<span class="sourceLineNo">1656</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>    result = ht.get(get);<a 
name="line.1657"></a>
+<span class="sourceLineNo">1658</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>        new long [] {STAMPS[3], 
STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8], STAMPS[9], STAMPS[11], 
STAMPS[13], STAMPS[15]},<a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>        new byte[][] {VALUES[3], 
VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8], VALUES[9], VALUES[11], 
VALUES[13], VALUES[15]},<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>        0, 9);<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span><a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>    scan = new Scan(ROW);<a 
name="line.1663"></a>
+<span class="sourceLineNo">1664</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1664"></a>
+<span class="sourceLineNo">1665</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>        new long [] {STAMPS[3], 
STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[7], STAMPS[8], STAMPS[9], STAMPS[11], 
STAMPS[13], STAMPS[15]},<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span>        new byte[][] {VALUES[3], 
VALUES[4], VALUES[5], VALUES[6], VALUES[7], VALUES[8], VALUES[9], VALUES[11], 
VALUES[13], VALUES[15]},<a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>        0, 9);<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span><a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>    // Delete a version in the memstore 
and a version in a storefile<a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>    Delete delete = new Delete(ROW);<a 
name="line.1673"></a>
+<span class="sourceLineNo">1674</span>    delete.addColumn(FAMILY, QUALIFIER, 
STAMPS[11]);<a name="line.1674"></a>
+<span class="sourceLineNo">1675</span>    delete.addColumn(FAMILY, QUALIFIER, 
STAMPS[7]);<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>    ht.delete(delete);<a 
name="line.1676"></a>
+<span class="sourceLineNo">1677</span><a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>    // Test that it's gone<a 
name="line.1678"></a>
+<span class="sourceLineNo">1679</span>    get = new Get(ROW);<a 
name="line.1679"></a>
+<span class="sourceLineNo">1680</span>    get.addColumn(FAMILY, QUALIFIER);<a 
name="line.1680"></a>
+<span class="sourceLineNo">1681</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>    result = ht.get(get);<a 
name="line.1682"></a>
+<span class="sourceLineNo">1683</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[8], STAMPS[9], 
STAMPS[13], STAMPS[15]},<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[8], VALUES[9], 
VALUES[13], VALUES[15]},<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>        0, 9);<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span><a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>    scan = new Scan(ROW);<a 
name="line.1688"></a>
+<span class="sourceLineNo">1689</span>    scan.addColumn(FAMILY, QUALIFIER);<a 
name="line.1689"></a>
+<span class="sourceLineNo">1690</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>    assertNResult(result, ROW, FAMILY, 
QUALIFIER,<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6], STAMPS[8], STAMPS[9], 
STAMPS[13], STAMPS[15]},<a name="line.1693"></a>
+<span class="sourceLineNo">1694</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3], VALUES[4], VALUES[5], VALUES[6], VALUES[8], VALUES[9], 
VALUES[13], VALUES[15]},<a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>        0, 9);<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>  @Test<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>  public void testVersionLimits() throws 
Exception {<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>    byte [][] FAMILIES = 
makeNAscii(FAMILY, 3);<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>    int [] LIMITS = {1,3,5};<a 
name="line.1703"></a>
+<span class="sourceLineNo">1704</span>    long [] STAMPS = makeStamps(10);<a 
name="line.1704"></a>
+<span class="sourceLineNo">1705</span>    byte [][] VALUES = makeNAscii(VALUE, 
10);<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>    Table ht = 
TEST_UTIL.createTable(tableName, FAMILIES, LIMITS);<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span><a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>    // Insert limit + 1 on each family<a 
name="line.1708"></a>
+<span class="sourceLineNo">1709</span>    Put put = new Put(ROW);<a 
name="line.1709"></a>
+<span class="sourceLineNo">1710</span>    put.addColumn(FAMILIES[0], 
QUALIFIER, STAMPS[0], VALUES[0]);<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span>    put.addColumn(FAMILIES[0], 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[0], VALUES[0]);<a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    put.addColumn(FAMILIES[1], 
QUALIFIER, STAMPS[3], VALUES[3]);<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[0], VALUES[0]);<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[1], VALUES[1]);<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[2], VALUES[2]);<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[3], VALUES[3]);<a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[4], VALUES[4]);<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[5], VALUES[5]);<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>    put.addColumn(FAMILIES[2], 
QUALIFIER, STAMPS[6], VALUES[6]);<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>    ht.put(put);<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span><a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>    // Verify we only get the right 
number out of each<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span><a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>    // Family0<a name="line.1727"></a>
 <span class="sourceLineNo">1728</span><a name="line.1728"></a>
-<span class="sourceLineNo">1729</span>    scan = new Scan(ROW);<a 
name="line.1729"></a>
-<span class="sourceLineNo">1730</span>    scan.addColumn(FAMILIES[1], 
QUALIFIER);<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>        0, 2);<a name="line.1736"></a>
+<span class="sourceLineNo">1729</span>    Get get = new Get(ROW);<a 
name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    get.addColumn(FAMILIES[0], 
QUALIFIER);<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>    Result result = ht.get(get);<a 
name="line.1732"></a>
+<span class="sourceLineNo">1733</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span>        new long [] {STAMPS[1]},<a 
name="line.1734"></a>
+<span class="sourceLineNo">1735</span>        new byte[][] {VALUES[1]},<a 
name="line.1735"></a>
+<span class="sourceLineNo">1736</span>        0, 0);<a name="line.1736"></a>
 <span class="sourceLineNo">1737</span><a name="line.1737"></a>
-<span class="sourceLineNo">1738</span>    scan = new Scan(ROW);<a 
name="line.1738"></a>
-<span class="sourceLineNo">1739</span>    scan.addFamily(FAMILIES[1]);<a 
name="line.1739"></a>
-<span class="sourceLineNo">1740</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>        0, 2);<a name="line.1745"></a>
+<span class="sourceLineNo">1738</span>    get = new Get(ROW);<a 
name="line.1738"></a>
+<span class="sourceLineNo">1739</span>    get.addFamily(FAMILIES[0]);<a 
name="line.1739"></a>
+<span class="sourceLineNo">1740</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>    result = ht.get(get);<a 
name="line.1741"></a>
+<span class="sourceLineNo">1742</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>        new long [] {STAMPS[1]},<a 
name="line.1743"></a>
+<span class="sourceLineNo">1744</span>        new byte[][] {VALUES[1]},<a 
name="line.1744"></a>
+<span class="sourceLineNo">1745</span>        0, 0);<a name="line.1745"></a>
 <span class="sourceLineNo">1746</span><a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>    // Family2<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span><a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>    get = new Get(ROW);<a 
name="line.1749"></a>
-<span class="sourceLineNo">1750</span>    get.addColumn(FAMILIES[2], 
QUALIFIER);<a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>    result = ht.get(get);<a 
name="line.1752"></a>
-<span class="sourceLineNo">1753</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span>        0, 4);<a name="line.1756"></a>
-<span class="sourceLineNo">1757</span><a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    get = new Get(ROW);<a 
name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    get.addFamily(FAMILIES[2]);<a 
name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span>    result = ht.get(get);<a 
name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1764"></a>
-<span class="sourceLineNo">1765</span>        0, 4);<a name="line.1765"></a>
+<span class="sourceLineNo">1747</span>    Scan scan = new Scan(ROW);<a 
name="line.1747"></a>
+<span class="sourceLineNo">1748</span>    scan.addColumn(FAMILIES[0], 
QUALIFIER);<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span>        new long [] {STAMPS[1]},<a 
name="line.1752"></a>
+<span class="sourceLineNo">1753</span>        new byte[][] {VALUES[1]},<a 
name="line.1753"></a>
+<span class="sourceLineNo">1754</span>        0, 0);<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span><a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>    scan = new Scan(ROW);<a 
name="line.1756"></a>
+<span class="sourceLineNo">1757</span>    scan.addFamily(FAMILIES[0]);<a 
name="line.1757"></a>
+<span class="sourceLineNo">1758</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>    assertNResult(result, ROW, 
FAMILIES[0], QUALIFIER,<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>        new long [] {STAMPS[1]},<a 
name="line.1761"></a>
+<span class="sourceLineNo">1762</span>        new byte[][] {VALUES[1]},<a 
name="line.1762"></a>
+<span class="sourceLineNo">1763</span>        0, 0);<a name="line.1763"></a>
+<span class="sourceLineNo">1764</span><a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>    // Family1<a name="line.1765"></a>
 <span class="sourceLineNo">1766</span><a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>    scan = new Scan(ROW);<a 
name="line.1767"></a>
-<span class="sourceLineNo">1768</span>    scan.addColumn(FAMILIES[2], 
QUALIFIER);<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1773"></a>
-<span class="sourceLineNo">1774</span>        0, 4);<a name="line.1774"></a>
+<span class="sourceLineNo">1767</span>    get = new Get(ROW);<a 
name="line.1767"></a>
+<span class="sourceLineNo">1768</span>    get.addColumn(FAMILIES[1], 
QUALIFIER);<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>    result = ht.get(get);<a 
name="line.1770"></a>
+<span class="sourceLineNo">1771</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>        0, 2);<a name="line.1774"></a>
 <span class="sourceLineNo">1775</span><a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>    scan = new Scan(ROW);<a 
name="line.1776"></a>
-<span class="sourceLineNo">1777</span>    scan.addFamily(FAMILIES[2]);<a 
name="line.1777"></a>
-<span class="sourceLineNo">1778</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span>        0, 4);<a name="line.1783"></a>
+<span class="sourceLineNo">1776</span>    get = new Get(ROW);<a 
name="line.1776"></a>
+<span class="sourceLineNo">1777</span>    get.addFamily(FAMILIES[1]);<a 
name="line.1777"></a>
+<span class="sourceLineNo">1778</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>    result = ht.get(get);<a 
name="line.1779"></a>
+<span class="sourceLineNo">1780</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>        0, 2);<a name="line.1783"></a>
 <span class="sourceLineNo">1784</span><a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>    // Try all families<a 
name="line.1785"></a>
-<span class="sourceLineNo">1786</span><a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>    get = new Get(ROW);<a 
name="line.1787"></a>
-<span class="sourceLineNo">1788</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>    result = ht.get(get);<a 
name="line.1789"></a>
-<span class="sourceLineNo">1790</span>    assertTrue("Expected 9 keys but 
received " + result.size(),<a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>        result.size() == 9);<a 
name="line.1791"></a>
-<span class="sourceLineNo">1792</span><a name="line.1792"></a>
-<span class="sourceLineNo">1793</span>    get = new Get(ROW);<a 
name="line.1793"></a>
-<span class="sourceLineNo">1794</span>    get.addFamily(FAMILIES[0]);<a 
name="line.1794"></a>
-<span class="sourceLineNo">1795</span>    get.addFamily(FAMILIES[1]);<a 
name="line.1795"></a>
-<span class="sourceLineNo">1796</span>    get.addFamily(FAMILIES[2]);<a 
name="line.1796"></a>
-<span class="sourceLineNo">1797</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span>    result = ht.get(get);<a 
name="line.1798"></a>
-<span class="sourceLineNo">1799</span>    assertTrue("Expected 9 keys but 
received " + result.size(),<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>        result.size() == 9);<a 
name="line.1800"></a>
-<span class="sourceLineNo">1801</span><a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>    get = new Get(ROW);<a 
name="line.1802"></a>
-<span class="sourceLineNo">1803</span>    get.addColumn(FAMILIES[0], 
QUALIFIER);<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>    get.addColumn(FAMILIES[1], 
QUALIFIER);<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>    get.addColumn(FAMILIES[2], 
QUALIFIER);<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>    result = ht.get(get);<a 
name="line.1807"></a>
-<span class="sourceLineNo">1808</span>    assertTrue("Expected 9 keys but 
received " + result.size(),<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span>        result.size() == 9);<a 
name="line.1809"></a>
-<span class="sourceLineNo">1810</span><a name="line.1810"></a>
-<span class="sourceLineNo">1811</span>    scan = new Scan(ROW);<a 
name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    assertTrue("Expected 9 keys but 
received " + result.size(),<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>        result.size() == 9);<a 
name="line.1815"></a>
-<span class="sourceLineNo">1816</span><a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>    scan = new Scan(ROW);<a 
name="line.1817"></a>
-<span class="sourceLineNo">1818</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>    scan.addFamily(FAMILIES[0]);<a 
name="line.1819"></a>
-<span class="sourceLineNo">1820</span>    scan.addFamily(FAMILIES[1]);<a 
name="line.1820"></a>
-<span class="sourceLineNo">1821</span>    scan.addFamily(FAMILIES[2]);<a 
name="line.1821"></a>
-<span class="sourceLineNo">1822</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>    assertTrue("Expected 9 keys but 
received " + result.size(),<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>        result.size() == 9);<a 
name="line.1824"></a>
-<span class="sourceLineNo">1825</span><a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>    scan = new Scan(ROW);<a 
name="line.1826"></a>
-<span class="sourceLineNo">1827</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>    scan.addColumn(FAMILIES[0], 
QUALIFIER);<a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    scan.addColumn(FAMILIES[1], 
QUALIFIER);<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span>    scan.addColumn(FAMILIES[2], 
QUALIFIER);<a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>    assertTrue("Expected 9 keys but 
received " + result.size(),<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>        result.size() == 9);<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>  @Test<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span>  public void testDeleteFamilyVersion() 
throws Exception {<a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>    Admin admin = 
TEST_UTIL.getAdmin();<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span><a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>    byte [][] QUALIFIERS = 
makeNAscii(QUALIFIER, 1);<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>    byte [][] VALUES = makeN(VALUE, 
5);<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>    long [] ts = {1000, 2000, 3000, 
4000, 5000};<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span><a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>    Table ht = 
TEST_UTIL.createTable(tableName, FAMILY, 5);<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span><a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>    Put put = new Put(ROW);<a 
name="line.1848"></a>
-<span class="sourceLineNo">1849</span>    for (int q = 0; q &lt; 1; q++)<a 
name="line.1849"></a>
-<span class="sourceLineNo">1850</span>      for (int t = 0; t &lt; 5; t++)<a 
name="line.1850"></a>
-<span class="sourceLineNo">1851</span>        put.addColumn(FAMILY, 
QUALIFIERS[q], ts[t], VALUES[t]);<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>    ht.put(put);<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span>    admin.flush(tableName);<a 
name="line.1853"></a>
-<span class="sourceLineNo">1854</span><a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>    Delete delete = new Delete(ROW);<a 
name="line.1855"></a>
-<span class="sourceLineNo">1856</span>    delete.addFamilyVersion(FAMILY, 
ts[1]);  // delete version '2000'<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span>    delete.addFamilyVersion(FAMILY, 
ts[3]);  // delete version '4000'<a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>    ht.delete(delete);<a 
name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    admin.flush(tableName);<a 
name="line.1859"></a>
-<span class="sourceLineNo">1860</span><a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    for (int i = 0; i &lt; 1; i++) {<a 
name="line.1861"></a>
-<span class="sourceLineNo">1862</span>      Get get = new Get(ROW);<a 
name="line.1862"></a>
-<span class="sourceLineNo">1863</span>      get.addColumn(FAMILY, 
QUALIFIERS[i]);<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>      
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span>      Result result = ht.get(get);<a 
name="line.1865"></a>
-<span class="sourceLineNo">1866</span>      // verify version 
'1000'/'3000'/'5000' remains for all columns<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>      assertNResult(result, ROW, FAMILY, 
QUALIFIERS[i],<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>          new long [] {ts[0], ts[2], 
ts[4]},<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>          new byte[][] {VALUES[0], 
VALUES[2], VALUES[4]},<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>          0, 2);<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>    }<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span>    ht.close();<a name="line.1872"></a>
-<span class="sourceLineNo">1873</span>    admin.close();<a 
name="line.1873"></a>
-<span class="sourceLineNo">1874</span>  }<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span><a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>  @Test<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>  public void 
testDeleteFamilyVersionWithOtherDeletes() throws Exception {<a 
name="line.1877"></a>
-<span class="sourceLineNo">1878</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span><a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>    byte [][] QUALIFIERS = 
makeNAscii(QUALIFIER, 5);<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>    byte [][] VALUES = makeN(VALUE, 
5);<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>    long [] ts = {1000, 2000, 3000, 
4000, 5000};<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span><a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>    Admin admin = 
TEST_UTIL.getAdmin();<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>    Table ht = 
TEST_UTIL.createTable(tableName, FAMILY, 5);<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>    Put put = null;<a 
name="line.1886"></a>
-<span class="sourceLineNo">1887</span>    Result result = null;<a 
name="line.1887"></a>
-<span class="sourceLineNo">1888</span>    Get get = null;<a 
name="line.1888"></a>
-<span class="sourceLineNo">1889</span>    Delete delete = null;<a 
name="line.1889"></a>
+<span class="sourceLineNo">1785</span>    scan = new Scan(ROW);<a 
name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    scan.addColumn(FAMILIES[1], 
QUALIFIER);<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span>        0, 2);<a name="line.1792"></a>
+<span class="sourceLineNo">1793</span><a name="line.1793"></a>
+<span class="sourceLineNo">1794</span>    scan = new Scan(ROW);<a 
name="line.1794"></a>
+<span class="sourceLineNo">1795</span>    scan.addFamily(FAMILIES[1]);<a 
name="line.1795"></a>
+<span class="sourceLineNo">1796</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>    assertNResult(result, ROW, 
FAMILIES[1], QUALIFIER,<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span>        new long [] {STAMPS[1], 
STAMPS[2], STAMPS[3]},<a name="line.1799"></a>
+<span class="sourceLineNo">1800</span>        new byte[][] {VALUES[1], 
VALUES[2], VALUES[3]},<a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>        0, 2);<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span><a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>    // Family2<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span><a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>    get = new Get(ROW);<a 
name="line.1805"></a>
+<span class="sourceLineNo">1806</span>    get.addColumn(FAMILIES[2], 
QUALIFIER);<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>    result = ht.get(get);<a 
name="line.1808"></a>
+<span class="sourceLineNo">1809</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>        0, 4);<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span><a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>    get = new Get(ROW);<a 
name="line.1814"></a>
+<span class="sourceLineNo">1815</span>    get.addFamily(FAMILIES[2]);<a 
name="line.1815"></a>
+<span class="sourceLineNo">1816</span>    
get.setMaxVersions(Integer.MAX_VALUE);<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>    result = ht.get(get);<a 
name="line.1817"></a>
+<span class="sourceLineNo">1818</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>        0, 4);<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span><a name="line.1822"></a>
+<span class="sourceLineNo">1823</span>    scan = new Scan(ROW);<a 
name="line.1823"></a>
+<span class="sourceLineNo">1824</span>    scan.addColumn(FAMILIES[2], 
QUALIFIER);<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>    
scan.setMaxVersions(Integer.MAX_VALUE);<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>    result = getSingleScanResult(ht, 
scan);<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span>    assertNResult(result, ROW, 
FAMILIES[2], QUALIFIER,<a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>        new long [] {STAMPS[2], 
STAMPS[3], STAMPS[4], STAMPS[5], STAMPS[6]},<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>        new byte[][] {VALUES[2], 
VALUES[3], VALUES[4], VALUES[5], VALUES[6]},<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>        0, 4);<a name="line.1830"></a>
+<span class="sourceLineNo">1831</span><a name="line.1831"></a>
+<span class="sourceLineNo">1832</span>    scan = new Scan(ROW);<a 
name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    scan.add

<TRUNCATED>

Reply via email to