Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-998 Narrow getClosestRowBefore by passing column family; fix broken test 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@714094 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-11-14 18:42:15 +00:00
parent 8e24a9fa03
commit ad9b391811
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -1037,7 +1037,7 @@ public class HRegion implements HConstants {
* <i>ts</i>. * <i>ts</i>.
* *
* @param row row key * @param row row key
* @param columnFamily * @param columnFamily Must include the column family delimiter character.
* @return map of values * @return map of values
* @throws IOException * @throws IOException
*/ */
@ -1068,6 +1068,7 @@ public class HRegion implements HConstants {
// Now that we've found our key, get the values // Now that we've found our key, get the values
HbaseMapWritable<byte [], Cell> cells = HbaseMapWritable<byte [], Cell> cells =
new HbaseMapWritable<byte [], Cell>(); new HbaseMapWritable<byte [], Cell>();
// This will get all results for this store.
store.getFull(key, null, cells); store.getFull(key, null, cells);
return new RowResult(key.getRow(), cells); return new RowResult(key.getRow(), cells);
} finally { } finally {
@ -1537,7 +1538,8 @@ public class HRegion implements HConstants {
* @param updatesByColumn Cell updates by column * @param updatesByColumn Cell updates by column
* @throws IOException * @throws IOException
*/ */
private void update(final TreeMap<HStoreKey, byte []> updatesByColumn, boolean writeToWAL) private void update(final TreeMap<HStoreKey, byte []> updatesByColumn,
boolean writeToWAL)
throws IOException { throws IOException {
if (updatesByColumn == null || updatesByColumn.size() <= 0) { if (updatesByColumn == null || updatesByColumn.size() <= 0) {
return; return;

65
src/test/org/apache/hadoop/hbase/regionserver/TestGet2.java
View File

@ -155,69 +155,68 @@ public class TestGet2 extends HBaseTestCase implements HConstants {
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
Map<byte [], Cell> results = Map<byte [], Cell> results =
region.getClosestRowBefore(Bytes.toBytes(T20)); region.getClosestRowBefore(Bytes.toBytes(T20), COLUMNS[0]);
assertEquals(T20, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T20, new String(results.get(COLUMNS[0]).getValue()));
batchUpdate = new BatchUpdate(T20); batchUpdate = new BatchUpdate(T20);
batchUpdate.delete(COLUMNS[0]); batchUpdate.delete(COLUMNS[0]);
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
results = region.getClosestRowBefore(Bytes.toBytes(T20)); results = region.getClosestRowBefore(Bytes.toBytes(T20), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
batchUpdate = new BatchUpdate(T30); batchUpdate = new BatchUpdate(T30);
batchUpdate.put(COLUMNS[0], T30.getBytes()); batchUpdate.put(COLUMNS[0], T30.getBytes());
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
results = region.getClosestRowBefore(Bytes.toBytes(T30)); results = region.getClosestRowBefore(Bytes.toBytes(T30), COLUMNS[0]);
assertEquals(T30, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T30, new String(results.get(COLUMNS[0]).getValue()));
batchUpdate = new BatchUpdate(T30); batchUpdate = new BatchUpdate(T30);
batchUpdate.delete(COLUMNS[0]); batchUpdate.delete(COLUMNS[0]);
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
results = region.getClosestRowBefore(Bytes.toBytes(T30)); results = region.getClosestRowBefore(Bytes.toBytes(T30), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
results = region.getClosestRowBefore(Bytes.toBytes(T31)); results = region.getClosestRowBefore(Bytes.toBytes(T31), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
region.flushcache(); region.flushcache();
// try finding "010" after flush // try finding "010" after flush
results = region.getClosestRowBefore(Bytes.toBytes(T30)); results = region.getClosestRowBefore(Bytes.toBytes(T30), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
results = region.getClosestRowBefore(Bytes.toBytes(T31)); results = region.getClosestRowBefore(Bytes.toBytes(T31), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
// Put into a different column family. Should make it so I get // Put into a different column family. Should make it so I still get t10
// and answer of t20.
batchUpdate = new BatchUpdate(T20); batchUpdate = new BatchUpdate(T20);
batchUpdate.put(COLUMNS[1], T20.getBytes()); batchUpdate.put(COLUMNS[1], T20.getBytes());
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
results = region.getClosestRowBefore(Bytes.toBytes(T30)); results = region.getClosestRowBefore(Bytes.toBytes(T30), COLUMNS[0]);
assertEquals(T20, new String(results.get(COLUMNS[1]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
results = region.getClosestRowBefore(Bytes.toBytes(T31)); results = region.getClosestRowBefore(Bytes.toBytes(T31), COLUMNS[0]);
assertEquals(T20, new String(results.get(COLUMNS[1]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
region.flushcache(); region.flushcache();
results = region.getClosestRowBefore(Bytes.toBytes(T30)); results = region.getClosestRowBefore(Bytes.toBytes(T30), COLUMNS[0]);
assertEquals(T20, new String(results.get(COLUMNS[1]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
results = region.getClosestRowBefore(Bytes.toBytes(T31)); results = region.getClosestRowBefore(Bytes.toBytes(T31), COLUMNS[0]);
assertEquals(T20, new String(results.get(COLUMNS[1]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
// Now try combo of memcache and mapfiles. Delete the t20 COLUMS[1] // Now try combo of memcache and mapfiles. Delete the t20 COLUMS[1]
// in memory; make sure we get back t10 again. // in memory; make sure we get back t10 again.
batchUpdate = new BatchUpdate(T20); batchUpdate = new BatchUpdate(T20);
batchUpdate.delete(COLUMNS[1]); batchUpdate.delete(COLUMNS[1]);
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
results = region.getClosestRowBefore(Bytes.toBytes(T30)); results = region.getClosestRowBefore(Bytes.toBytes(T30), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
// Ask for a value off the end of the file. Should return t10. // Ask for a value off the end of the file. Should return t10.
results = region.getClosestRowBefore(Bytes.toBytes(T31)); results = region.getClosestRowBefore(Bytes.toBytes(T31), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
region.flushcache(); region.flushcache();
results = region.getClosestRowBefore(Bytes.toBytes(T31)); results = region.getClosestRowBefore(Bytes.toBytes(T31), COLUMNS[0]);
assertEquals(T10, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T10, new String(results.get(COLUMNS[0]).getValue()));
// Ok. Let the candidate come out of mapfiles but have delete of // Ok. Let the candidate come out of mapfiles but have delete of
@ -228,7 +227,7 @@ public class TestGet2 extends HBaseTestCase implements HConstants {
batchUpdate = new BatchUpdate(T10); batchUpdate = new BatchUpdate(T10);
batchUpdate.delete(COLUMNS[0]); batchUpdate.delete(COLUMNS[0]);
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
results = region.getClosestRowBefore(Bytes.toBytes(T12)); results = region.getClosestRowBefore(Bytes.toBytes(T12), COLUMNS[0]);
assertEquals(T11, new String(results.get(COLUMNS[0]).getValue())); assertEquals(T11, new String(results.get(COLUMNS[0]).getValue()));
} finally { } finally {
if (region != null) { if (region != null) {
@ -392,40 +391,40 @@ public class TestGet2 extends HBaseTestCase implements HConstants {
// try finding "015" // try finding "015"
String t15 = "015"; String t15 = "015";
Map<byte [], Cell> results = Map<byte [], Cell> results =
region.getClosestRowBefore(Bytes.toBytes(t15)); region.getClosestRowBefore(Bytes.toBytes(t15), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t10 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t10 bytes");
// try "020", we should get that row exactly // try "020", we should get that row exactly
results = region.getClosestRowBefore(Bytes.toBytes(t20)); results = region.getClosestRowBefore(Bytes.toBytes(t20), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t20 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t20 bytes");
// try "038", should skip deleted "035" and get "030" // try "038", should skip deleted "035" and get "030"
String t38 = "038"; String t38 = "038";
results = region.getClosestRowBefore(Bytes.toBytes(t38)); results = region.getClosestRowBefore(Bytes.toBytes(t38), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes");
// try "050", should get stuff from "040" // try "050", should get stuff from "040"
String t50 = "050"; String t50 = "050";
results = region.getClosestRowBefore(Bytes.toBytes(t50)); results = region.getClosestRowBefore(Bytes.toBytes(t50), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t40 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t40 bytes");
// force a flush // force a flush
region.flushcache(); region.flushcache();
// try finding "015" // try finding "015"
results = region.getClosestRowBefore(Bytes.toBytes(t15)); results = region.getClosestRowBefore(Bytes.toBytes(t15), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t10 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t10 bytes");
// try "020", we should get that row exactly // try "020", we should get that row exactly
results = region.getClosestRowBefore(Bytes.toBytes(t20)); results = region.getClosestRowBefore(Bytes.toBytes(t20), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t20 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t20 bytes");
// try "038", should skip deleted "035" and get "030" // try "038", should skip deleted "035" and get "030"
results = region.getClosestRowBefore(Bytes.toBytes(t38)); results = region.getClosestRowBefore(Bytes.toBytes(t38), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes");
// try "050", should get stuff from "040" // try "050", should get stuff from "040"
results = region.getClosestRowBefore(Bytes.toBytes(t50)); results = region.getClosestRowBefore(Bytes.toBytes(t50), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t40 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t40 bytes");
} finally { } finally {
if (region != null) { if (region != null) {
@ -470,13 +469,13 @@ public class TestGet2 extends HBaseTestCase implements HConstants {
// try finding "035" // try finding "035"
String t35 = "035"; String t35 = "035";
Map<byte [], Cell> results = Map<byte [], Cell> results =
region.getClosestRowBefore(Bytes.toBytes(t35)); region.getClosestRowBefore(Bytes.toBytes(t35), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes");
region.flushcache(); region.flushcache();
// try finding "035" // try finding "035"
results = region.getClosestRowBefore(Bytes.toBytes(t35)); results = region.getClosestRowBefore(Bytes.toBytes(t35), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes");
batchUpdate = new BatchUpdate(t20); batchUpdate = new BatchUpdate(t20);
@ -484,13 +483,13 @@ public class TestGet2 extends HBaseTestCase implements HConstants {
region.batchUpdate(batchUpdate, null); region.batchUpdate(batchUpdate, null);
// try finding "035" // try finding "035"
results = region.getClosestRowBefore(Bytes.toBytes(t35)); results = region.getClosestRowBefore(Bytes.toBytes(t35), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes");
region.flushcache(); region.flushcache();
// try finding "035" // try finding "035"
results = region.getClosestRowBefore(Bytes.toBytes(t35)); results = region.getClosestRowBefore(Bytes.toBytes(t35), COLUMNS[0]);
assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes"); assertEquals(new String(results.get(COLUMNS[0]).getValue()), "t30 bytes");
} finally { } finally {
if (region != null) { if (region != null) {