Author: stack
Date: Thu Apr 14 04:25:46 2011
New Revision: 1091996
URL: http://svn.apache.org/viewvc?rev=1091996&view=rev
Log:
HBASE-3685 when multiple columns are combined with TimestampFilter, only one
column is returned
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1091996&r1=1091995&r2=1091996&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Apr 14 04:25:46 2011
@@ -18,6 +18,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)
IMPROVEMENT
HBASE-3717 deprecate HTable isTableEnabled() methods in favor of HBaseAdmin
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java?rev=1091996&r1=1091995&r2=1091996&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
Thu Apr 14 04:25:46 2011
@@ -206,6 +206,7 @@ public class ExplicitColumnTracker imple
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) {
Modified:
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java?rev=1091996&r1=1091995&r2=1091996&view=diff
==============================================================================
---
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
(original)
+++
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
Thu Apr 14 04:25:46 2011
@@ -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.
*
