HBASE-1540 Client delete unit test, define behavior
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@786374 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack
parent
d59345ff81
commit
26559442b7
|
|
@ -363,6 +363,8 @@ Release 0.20.0 - Unreleased
|
||||||
HBASE-1488 Fix TestThriftServer and re-enable it
|
HBASE-1488 Fix TestThriftServer and re-enable it
|
||||||
HBASE-1541 Scanning multiple column families in the presence of deleted
|
HBASE-1541 Scanning multiple column families in the presence of deleted
|
||||||
families results in bad scans
|
families results in bad scans
|
||||||
|
HBASE-1540 Client delete unit test, define behavior
|
||||||
|
(Jonathan Gray via Stack)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
HBASE-1412 Change values for delete column and column family in KeyValue
|
HBASE-1412 Change values for delete column and column family in KeyValue
|
||||||
|
|
|
||||||
|
|
@ -1032,9 +1032,254 @@ public class TestClient extends HBaseClusterTestCase {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void XtestDeletes() throws Exception {
|
public void testDeletes() throws Exception {
|
||||||
|
|
||||||
|
byte [] TABLE = Bytes.toBytes("testDeletes");
|
||||||
|
|
||||||
|
byte [][] ROWS = makeNAscii(ROW, 6);
|
||||||
|
byte [][] FAMILIES = makeN(FAMILY, 3);
|
||||||
|
byte [][] VALUES = makeN(VALUE, 5);
|
||||||
|
long [] ts = {1000, 2000, 3000, 4000, 5000};
|
||||||
|
|
||||||
|
HTable ht = createTable(TABLE, FAMILIES);
|
||||||
|
|
||||||
|
Put put = new Put(ROW);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[1], VALUES[1]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
Delete delete = new Delete(ROW);
|
||||||
|
delete.deleteFamily(FAMILIES[0], ts[0]);
|
||||||
|
ht.delete(delete);
|
||||||
|
|
||||||
|
Get get = new Get(ROW);
|
||||||
|
get.addFamily(FAMILIES[0]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
Result result = ht.get(get);
|
||||||
|
assertNResult(result, ROW, FAMILIES[0], QUALIFIER,
|
||||||
|
new long [] {ts[1]},
|
||||||
|
new byte[][] {VALUES[1]},
|
||||||
|
0, 0);
|
||||||
|
|
||||||
|
Scan scan = new Scan(ROW);
|
||||||
|
scan.addFamily(FAMILIES[0]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = getSingleScanResult(ht, scan);
|
||||||
|
assertNResult(result, ROW, FAMILIES[0], QUALIFIER,
|
||||||
|
new long [] {ts[1]},
|
||||||
|
new byte[][] {VALUES[1]},
|
||||||
|
0, 0);
|
||||||
|
|
||||||
// Test delete latest version
|
// Test delete latest version
|
||||||
|
put = new Put(ROW);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[2], VALUES[2]);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[3], VALUES[3]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
delete = new Delete(ROW);
|
||||||
|
delete.deleteColumn(FAMILIES[0], QUALIFIER);
|
||||||
|
ht.delete(delete);
|
||||||
|
|
||||||
|
get = new Get(ROW);
|
||||||
|
get.addFamily(FAMILIES[0]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertNResult(result, ROW, FAMILIES[0], QUALIFIER,
|
||||||
|
new long [] {ts[1], ts[2], ts[3]},
|
||||||
|
new byte[][] {VALUES[1], VALUES[2], VALUES[3]},
|
||||||
|
0, 2);
|
||||||
|
|
||||||
|
scan = new Scan(ROW);
|
||||||
|
scan.addFamily(FAMILIES[0]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = getSingleScanResult(ht, scan);
|
||||||
|
assertNResult(result, ROW, FAMILIES[0], QUALIFIER,
|
||||||
|
new long [] {ts[1], ts[2], ts[3]},
|
||||||
|
new byte[][] {VALUES[1], VALUES[2], VALUES[3]},
|
||||||
|
0, 2);
|
||||||
|
|
||||||
|
// Expected client behavior might be that you can re-put deleted values
|
||||||
|
// But alas, this is not to be. We can't put them back in either case.
|
||||||
|
|
||||||
|
put = new Put(ROW);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
|
||||||
|
put.add(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
// The Get returns the latest value but then does not return the
|
||||||
|
// oldest, which was never deleted, ts[1].
|
||||||
|
|
||||||
|
get = new Get(ROW);
|
||||||
|
get.addFamily(FAMILIES[0]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertNResult(result, ROW, FAMILIES[0], QUALIFIER,
|
||||||
|
new long [] {ts[2], ts[3], ts[4]},
|
||||||
|
new byte[][] {VALUES[2], VALUES[3], VALUES[4]},
|
||||||
|
0, 2);
|
||||||
|
|
||||||
|
// The Scanner returns the previous values, the expected-unexpected behavior
|
||||||
|
|
||||||
|
scan = new Scan(ROW);
|
||||||
|
scan.addFamily(FAMILIES[0]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = getSingleScanResult(ht, scan);
|
||||||
|
assertNResult(result, ROW, FAMILIES[0], QUALIFIER,
|
||||||
|
new long [] {ts[1], ts[2], ts[3]},
|
||||||
|
new byte[][] {VALUES[1], VALUES[2], VALUES[3]},
|
||||||
|
0, 2);
|
||||||
|
|
||||||
|
// Test deleting an entire family from one row but not the other various ways
|
||||||
|
|
||||||
|
put = new Put(ROWS[0]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
put = new Put(ROWS[1]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
put = new Put(ROWS[2]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
delete = new Delete(ROWS[0]);
|
||||||
|
delete.deleteFamily(FAMILIES[2]);
|
||||||
|
ht.delete(delete);
|
||||||
|
|
||||||
|
delete = new Delete(ROWS[1]);
|
||||||
|
delete.deleteColumns(FAMILIES[1], QUALIFIER);
|
||||||
|
ht.delete(delete);
|
||||||
|
|
||||||
|
delete = new Delete(ROWS[2]);
|
||||||
|
delete.deleteColumn(FAMILIES[1], QUALIFIER);
|
||||||
|
delete.deleteColumn(FAMILIES[1], QUALIFIER);
|
||||||
|
delete.deleteColumn(FAMILIES[2], QUALIFIER);
|
||||||
|
ht.delete(delete);
|
||||||
|
|
||||||
|
get = new Get(ROWS[0]);
|
||||||
|
get.addFamily(FAMILIES[1]);
|
||||||
|
get.addFamily(FAMILIES[2]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertTrue("Expected 2 keys but received " + result.size(),
|
||||||
|
result.size() == 2);
|
||||||
|
assertNResult(result, ROWS[0], FAMILIES[1], QUALIFIER,
|
||||||
|
new long [] {ts[0], ts[1]},
|
||||||
|
new byte[][] {VALUES[0], VALUES[1]},
|
||||||
|
0, 1);
|
||||||
|
|
||||||
|
scan = new Scan(ROWS[0]);
|
||||||
|
scan.addFamily(FAMILIES[1]);
|
||||||
|
scan.addFamily(FAMILIES[2]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = getSingleScanResult(ht, scan);
|
||||||
|
assertTrue("Expected 2 keys but received " + result.size(),
|
||||||
|
result.size() == 2);
|
||||||
|
assertNResult(result, ROWS[0], FAMILIES[1], QUALIFIER,
|
||||||
|
new long [] {ts[0], ts[1]},
|
||||||
|
new byte[][] {VALUES[0], VALUES[1]},
|
||||||
|
0, 1);
|
||||||
|
|
||||||
|
get = new Get(ROWS[1]);
|
||||||
|
get.addFamily(FAMILIES[1]);
|
||||||
|
get.addFamily(FAMILIES[2]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertTrue("Expected 2 keys but received " + result.size(),
|
||||||
|
result.size() == 2);
|
||||||
|
|
||||||
|
scan = new Scan(ROWS[1]);
|
||||||
|
scan.addFamily(FAMILIES[1]);
|
||||||
|
scan.addFamily(FAMILIES[2]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = getSingleScanResult(ht, scan);
|
||||||
|
assertTrue("Expected 2 keys but received " + result.size(),
|
||||||
|
result.size() == 2);
|
||||||
|
|
||||||
|
get = new Get(ROWS[2]);
|
||||||
|
get.addFamily(FAMILIES[1]);
|
||||||
|
get.addFamily(FAMILIES[2]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertTrue("Expected 1 key but received " + result.size(),
|
||||||
|
result.size() == 1);
|
||||||
|
assertNResult(result, ROWS[2], FAMILIES[2], QUALIFIER,
|
||||||
|
new long [] {ts[2]},
|
||||||
|
new byte[][] {VALUES[2]},
|
||||||
|
0, 0);
|
||||||
|
|
||||||
|
scan = new Scan(ROWS[2]);
|
||||||
|
scan.addFamily(FAMILIES[1]);
|
||||||
|
scan.addFamily(FAMILIES[2]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = getSingleScanResult(ht, scan);
|
||||||
|
assertTrue("Expected 1 key but received " + result.size(),
|
||||||
|
result.size() == 1);
|
||||||
|
assertNResult(result, ROWS[2], FAMILIES[2], QUALIFIER,
|
||||||
|
new long [] {ts[2]},
|
||||||
|
new byte[][] {VALUES[2]},
|
||||||
|
0, 0);
|
||||||
|
|
||||||
|
// Test if we delete the family first in one row (HBASE-1541)
|
||||||
|
|
||||||
|
delete = new Delete(ROWS[3]);
|
||||||
|
delete.deleteFamily(FAMILIES[1]);
|
||||||
|
ht.delete(delete);
|
||||||
|
|
||||||
|
put = new Put(ROWS[3]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, VALUES[0]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
put = new Put(ROWS[4]);
|
||||||
|
put.add(FAMILIES[1], QUALIFIER, VALUES[1]);
|
||||||
|
put.add(FAMILIES[2], QUALIFIER, VALUES[2]);
|
||||||
|
ht.put(put);
|
||||||
|
|
||||||
|
get = new Get(ROWS[3]);
|
||||||
|
get.addFamily(FAMILIES[1]);
|
||||||
|
get.addFamily(FAMILIES[2]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertTrue("Expected 1 key but received " + result.size(),
|
||||||
|
result.size() == 1);
|
||||||
|
|
||||||
|
get = new Get(ROWS[4]);
|
||||||
|
get.addFamily(FAMILIES[1]);
|
||||||
|
get.addFamily(FAMILIES[2]);
|
||||||
|
get.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
result = ht.get(get);
|
||||||
|
assertTrue("Expected 2 keys but received " + result.size(),
|
||||||
|
result.size() == 2);
|
||||||
|
|
||||||
|
scan = new Scan(ROWS[3]);
|
||||||
|
scan.addFamily(FAMILIES[1]);
|
||||||
|
scan.addFamily(FAMILIES[2]);
|
||||||
|
scan.setMaxVersions(Integer.MAX_VALUE);
|
||||||
|
ResultScanner scanner = ht.getScanner(scan);
|
||||||
|
result = scanner.next();
|
||||||
|
assertTrue("Expected 1 key but received " + result.size(),
|
||||||
|
result.size() == 1);
|
||||||
|
assertTrue(Bytes.equals(result.sorted()[0].getRow(), ROWS[3]));
|
||||||
|
assertTrue(Bytes.equals(result.sorted()[0].getValue(), VALUES[0]));
|
||||||
|
result = scanner.next();
|
||||||
|
assertTrue("Expected 2 keys but received " + result.size(),
|
||||||
|
result.size() == 2);
|
||||||
|
assertTrue(Bytes.equals(result.sorted()[0].getRow(), ROWS[4]));
|
||||||
|
assertTrue(Bytes.equals(result.sorted()[1].getRow(), ROWS[4]));
|
||||||
|
assertTrue(Bytes.equals(result.sorted()[0].getValue(), VALUES[1]));
|
||||||
|
assertTrue(Bytes.equals(result.sorted()[1].getValue(), VALUES[2]));
|
||||||
|
scanner.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue