You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jg...@apache.org on 2010/10/30 18:01:07 UTC
svn commit: r1029105 - in /hbase/trunk: CHANGES.txt
src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java
Author: jgray
Date: Sat Oct 30 16:01:07 2010
New Revision: 1029105
URL: http://svn.apache.org/viewvc?rev=1029105&view=rev
Log:
HBASE-3175 Commit of HBASE-3160 broke TestPriorityCompactionQueue up on hudson (nicolas via jgray)
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1029105&r1=1029104&r2=1029105&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Oct 30 16:01:07 2010
@@ -627,6 +627,8 @@ Release 0.21.0 - Unreleased
HBASE-3172 Reverse order of AssignmentManager and MetaNodeTracker in
ZooKeeperWatcher
HBASE-2406 Define semantics of cell timestamps/versions
+ HBASE-3175 Commit of HBASE-3160 broke TestPriorityCompactionQueue up on
+ hudson (nicolas via jgray)
IMPROVEMENTS
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java?rev=1029105&r1=1029104&r2=1029105&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java Sat Oct 30 16:01:07 2010
@@ -104,11 +104,11 @@ public class TestPriorityCompactionQueue
// test 1
// check fifo w/priority
- addRegion(pq, r1, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r2, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r1, 0);
+ addRegion(pq, r2, 0);
+ addRegion(pq, r3, 0);
+ addRegion(pq, r4, 0);
+ addRegion(pq, r5, 0);
getAndCheckRegion(pq, r1);
getAndCheckRegion(pq, r2);
@@ -118,11 +118,11 @@ public class TestPriorityCompactionQueue
// test 2
// check fifo w/mixed priority
- addRegion(pq, r1, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r1, 0);
addRegion(pq, r2, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r3, 0);
addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r5, 0);
getAndCheckRegion(pq, r1);
getAndCheckRegion(pq, r3);
@@ -136,7 +136,7 @@ public class TestPriorityCompactionQueue
addRegion(pq, r2, CompactSplitThread.PRIORITY_USER);
addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r5, 0);
getAndCheckRegion(pq, r5);
getAndCheckRegion(pq, r1);
@@ -147,11 +147,11 @@ public class TestPriorityCompactionQueue
// test 4
// check fifo w/mixed priority elevation time
addRegion(pq, r1, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r2, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r2, 0);
addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
Thread.sleep(1000);
addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r5, 0);
getAndCheckRegion(pq, r2);
getAndCheckRegion(pq, r5);
@@ -170,7 +170,7 @@ public class TestPriorityCompactionQueue
addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
- addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r3, 0);
getAndCheckRegion(pq, r3);
getAndCheckRegion(pq, r1);
@@ -205,14 +205,14 @@ public class TestPriorityCompactionQueue
// we can handle negative priorities
addRegion(pq, r1, CompactSplitThread.PRIORITY_USER);
addRegion(pq, r2, -1);
- addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
+ addRegion(pq, r3, 0);
addRegion(pq, r4, -2);
-
+
getAndCheckRegion(pq, r4);
getAndCheckRegion(pq, r2);
getAndCheckRegion(pq, r3);
getAndCheckRegion(pq, r1);
-
+
Assert.assertTrue("Queue should be empty.", pq.size() == 0);
}
-}
\ No newline at end of file
+}