You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2010/07/20 08:59:39 UTC
svn commit: r965736 - in /hbase/trunk: CHANGES.txt
src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
Author: rawson
Date: Tue Jul 20 06:59:38 2010
New Revision: 965736
URL: http://svn.apache.org/viewvc?rev=965736&view=rev
Log:
HBASE-2854 broken tests on trunk
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=965736&r1=965735&r2=965736&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jul 20 06:59:38 2010
@@ -445,7 +445,7 @@ Release 0.21.0 - Unreleased
HBASE-2851 Remove testDynamicBloom() unit test
(Nicolas Spiegelberg via Stack)
HBASE-2853 TestLoadIncrementalHFiles fails on TRUNK
-
+ HBASE-2854 broken tests on trunk
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java?rev=965736&r1=965735&r2=965736&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java Tue Jul 20 06:59:38 2010
@@ -87,29 +87,30 @@ public class TestQueryMatcher extends HB
//Expected result
List<MatchCode> expected = new ArrayList<ScanQueryMatcher.MatchCode>();
- expected.add(ScanQueryMatcher.MatchCode.SKIP);
+ expected.add(ScanQueryMatcher.MatchCode.SEEK_NEXT_COL);
expected.add(ScanQueryMatcher.MatchCode.INCLUDE);
- expected.add(ScanQueryMatcher.MatchCode.SKIP);
+ expected.add(ScanQueryMatcher.MatchCode.SEEK_NEXT_COL);
expected.add(ScanQueryMatcher.MatchCode.INCLUDE);
expected.add(ScanQueryMatcher.MatchCode.INCLUDE);
expected.add(ScanQueryMatcher.MatchCode.DONE);
+ // 2,4,5
ScanQueryMatcher qm = new ScanQueryMatcher(scan, fam2,
get.getFamilyMap().get(fam2), ttl, rowComparator, 1);
List<KeyValue> memstore = new ArrayList<KeyValue>();
- memstore.add(new KeyValue(row1, fam2, col1, data));
- memstore.add(new KeyValue(row1, fam2, col2, data));
- memstore.add(new KeyValue(row1, fam2, col3, data));
- memstore.add(new KeyValue(row1, fam2, col4, data));
- memstore.add(new KeyValue(row1, fam2, col5, data));
+ memstore.add(new KeyValue(row1, fam2, col1, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col2, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col3, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col4, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col5, 1, data));
memstore.add(new KeyValue(row2, fam1, col1, data));
List<ScanQueryMatcher.MatchCode> actual = new ArrayList<ScanQueryMatcher.MatchCode>();
+ qm.setRow(memstore.get(0).getRow());
- for(KeyValue kv : memstore){
- qm.setRow(kv.getRow());
+ for (KeyValue kv : memstore){
actual.add(qm.match(kv));
}
@@ -136,22 +137,23 @@ public class TestQueryMatcher extends HB
expected.add(ScanQueryMatcher.MatchCode.INCLUDE);
expected.add(ScanQueryMatcher.MatchCode.INCLUDE);
expected.add(ScanQueryMatcher.MatchCode.INCLUDE);
- expected.add(ScanQueryMatcher.MatchCode.NEXT);
+ expected.add(ScanQueryMatcher.MatchCode.DONE);
ScanQueryMatcher qm = new ScanQueryMatcher(scan, fam2, null, ttl, rowComparator, 1);
List<KeyValue> memstore = new ArrayList<KeyValue>();
- memstore.add(new KeyValue(row1, fam2, col1, data));
- memstore.add(new KeyValue(row1, fam2, col2, data));
- memstore.add(new KeyValue(row1, fam2, col3, data));
- memstore.add(new KeyValue(row1, fam2, col4, data));
- memstore.add(new KeyValue(row1, fam2, col5, data));
- memstore.add(new KeyValue(row2, fam1, col1, data));
+ memstore.add(new KeyValue(row1, fam2, col1, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col2, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col3, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col4, 1, data));
+ memstore.add(new KeyValue(row1, fam2, col5, 1, data));
+ memstore.add(new KeyValue(row2, fam1, col1, 1, data));
List<ScanQueryMatcher.MatchCode> actual = new ArrayList<ScanQueryMatcher.MatchCode>();
+ qm.setRow(memstore.get(0).getRow());
+
for(KeyValue kv : memstore) {
- qm.setRow(kv.getRow());
actual.add(qm.match(kv));
}
@@ -179,12 +181,12 @@ public class TestQueryMatcher extends HB
long testTTL = 1000;
MatchCode [] expected = new MatchCode[] {
- ScanQueryMatcher.MatchCode.SKIP,
+ ScanQueryMatcher.MatchCode.SEEK_NEXT_COL,
ScanQueryMatcher.MatchCode.INCLUDE,
- ScanQueryMatcher.MatchCode.SKIP,
+ ScanQueryMatcher.MatchCode.SEEK_NEXT_COL,
ScanQueryMatcher.MatchCode.INCLUDE,
- ScanQueryMatcher.MatchCode.SKIP,
- ScanQueryMatcher.MatchCode.NEXT
+ ScanQueryMatcher.MatchCode.SEEK_NEXT_COL,
+ ScanQueryMatcher.MatchCode.DONE
};
ScanQueryMatcher qm = new ScanQueryMatcher(scan, fam2,
@@ -200,9 +202,10 @@ public class TestQueryMatcher extends HB
new KeyValue(row2, fam1, col1, now-10, data)
};
+ qm.setRow(kvs[0].getRow());
+
List<MatchCode> actual = new ArrayList<MatchCode>(kvs.length);
for (KeyValue kv : kvs) {
- qm.setRow(kv.getRow());
actual.add( qm.match(kv) );
}
@@ -232,10 +235,10 @@ public class TestQueryMatcher extends HB
MatchCode [] expected = new MatchCode[] {
ScanQueryMatcher.MatchCode.INCLUDE,
ScanQueryMatcher.MatchCode.INCLUDE,
- ScanQueryMatcher.MatchCode.SKIP,
+ ScanQueryMatcher.MatchCode.SEEK_NEXT_COL,
ScanQueryMatcher.MatchCode.INCLUDE,
- ScanQueryMatcher.MatchCode.SKIP,
- ScanQueryMatcher.MatchCode.NEXT
+ ScanQueryMatcher.MatchCode.SEEK_NEXT_COL,
+ ScanQueryMatcher.MatchCode.DONE
};
ScanQueryMatcher qm = new ScanQueryMatcher(scan, fam2,
@@ -250,10 +253,10 @@ public class TestQueryMatcher extends HB
new KeyValue(row1, fam2, col5, now-10000, data),
new KeyValue(row2, fam1, col1, now-10, data)
};
+ qm.setRow(kvs[0].getRow());
List<ScanQueryMatcher.MatchCode> actual = new ArrayList<ScanQueryMatcher.MatchCode>(kvs.length);
for (KeyValue kv : kvs) {
- qm.setRow(kv.getRow());
actual.add( qm.match(kv) );
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java?rev=965736&r1=965735&r2=965736&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java Tue Jul 20 06:59:38 2010
@@ -286,7 +286,7 @@ public class TestStore extends TestCase
* test the internal details of how ICV works, especially during a flush scenario.
*/
public void testIncrementColumnValue_ICVDuringFlush()
- throws IOException {
+ throws IOException, InterruptedException {
init(this.getName());
long oldValue = 1L;
@@ -303,6 +303,9 @@ public class TestStore extends TestCase
System.currentTimeMillis(),
Bytes.toBytes(oldValue)));
+ // sleep 2 ms to space out the increments.
+ Thread.sleep(2);
+
// update during the snapshot.
long ret = this.store.updateColumnValue(row, family, qf1, newValue);