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

HBASE-3685 when multiple columns are combined with TimestampFilter, only one column is returned 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1091995 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-04-14 04:24:25 +00:00
parent e228a142a8
commit 5486d8df70
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -204,6 +204,8 @@ Release 0.90.3 - Unreleased
message with more help
HBASE-3722 A lot of data is lost when name node crashed (gaojinchao)
HBASE-3771 All jsp pages don't clean their HBA
HBASE-3685 when multiple columns are combined with TimestampFilter, only
one column is returned (Jerry Chen)
IMPROVEMENTS
HBASE-3747 ReplicationSource should differanciate remote and local exceptions

1
src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
View File

@ -206,6 +206,7 @@ public class ExplicitColumnTracker implements ColumnTracker {
while (this.column != null) {
int compare = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), bytes, offset, length);
resetTS();
if (compare == 0) {
this.columns.remove(this.index);
if (this.columns.size() == this.index) {

46
src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
View File

@ -163,6 +163,52 @@ public class TestTimestampsFilter {
}
}
@Test
public void testMultiColumns() throws Exception {
byte [] TABLE = Bytes.toBytes("testTimestampsFilterMultiColumns");
byte [] FAMILY = Bytes.toBytes("event_log");
byte [][] FAMILIES = new byte[][] { FAMILY };
KeyValue kvs[];
// create table; set versions to max...
HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
Put p = new Put(Bytes.toBytes("row"));
p.add(FAMILY, Bytes.toBytes("column0"), 3, Bytes.toBytes("value0-3"));
p.add(FAMILY, Bytes.toBytes("column1"), 3, Bytes.toBytes("value1-3"));
p.add(FAMILY, Bytes.toBytes("column2"), 1, Bytes.toBytes("value2-1"));
p.add(FAMILY, Bytes.toBytes("column2"), 2, Bytes.toBytes("value2-2"));
p.add(FAMILY, Bytes.toBytes("column2"), 3, Bytes.toBytes("value2-3"));
p.add(FAMILY, Bytes.toBytes("column3"), 2, Bytes.toBytes("value3-2"));
p.add(FAMILY, Bytes.toBytes("column4"), 1, Bytes.toBytes("value4-1"));
p.add(FAMILY, Bytes.toBytes("column4"), 2, Bytes.toBytes("value4-2"));
p.add(FAMILY, Bytes.toBytes("column4"), 3, Bytes.toBytes("value4-3"));
ht.put(p);
ArrayList timestamps = new ArrayList();
timestamps.add(new Long(3));
TimestampsFilter filter = new TimestampsFilter(timestamps);
Get g = new Get(Bytes.toBytes("row"));
g.setFilter(filter);
g.setMaxVersions();
g.addColumn(FAMILY, Bytes.toBytes("column2"));
g.addColumn(FAMILY, Bytes.toBytes("column4"));
Result result = ht.get(g);
for (KeyValue kv : result.list()) {
System.out.println("found row " + Bytes.toString(kv.getRow()) +
", column " + Bytes.toString(kv.getQualifier()) + ", value "
+ Bytes.toString(kv.getValue()));
}
assertEquals(result.list().size(), 2);
assertEquals(Bytes.toString(result.list().get(0).getValue()),
"value2-3");
assertEquals(Bytes.toString(result.list().get(1).getValue()),
"value4-3");
}
/**
* Test TimestampsFilter in the presence of version deletes.
*