svn commit: r1028624 - /hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java

[stack]

Author: stack
Date: Fri Oct 29 06:20:52 2010
New Revision: 1028624

URL: http://svn.apache.org/viewvc?rev=1028624&view=rev
Log:
HBASE-3160 Use more intelligent priorities for PriorityCompactionQueue

Modified:
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityCompactionQueue.java

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=1028624&r1=1028623&r2=1028624&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
 Fri Oct 29 06:20:52 2010
@@ -104,11 +104,11 @@ public class TestPriorityCompactionQueue
 
     // test 1
     // check fifo w/priority
-    addRegion(pq, r1, CompactSplitThread.PRIORITY_BLOCKING);
-    addRegion(pq, r2, CompactSplitThread.PRIORITY_BLOCKING);
-    addRegion(pq, r3, CompactSplitThread.PRIORITY_BLOCKING);
-    addRegion(pq, r4, CompactSplitThread.PRIORITY_BLOCKING);
-    addRegion(pq, r5, CompactSplitThread.PRIORITY_BLOCKING);
+    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);
 
     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_BLOCKING);
+    addRegion(pq, r1, CompactSplitThread.PRIORITY_USER);
     addRegion(pq, r2, CompactSplitThread.PRIORITY_USER);
-    addRegion(pq, r3, CompactSplitThread.PRIORITY_BLOCKING);
+    addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
     addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
-    addRegion(pq, r5, CompactSplitThread.PRIORITY_BLOCKING);
+    addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
 
     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_BLOCKING);
+    addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
 
     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_BLOCKING);
+    addRegion(pq, r2, CompactSplitThread.PRIORITY_USER);
     addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
     Thread.sleep(1000);
     addRegion(pq, r4, CompactSplitThread.PRIORITY_USER);
-    addRegion(pq, r5, CompactSplitThread.PRIORITY_BLOCKING);
+    addRegion(pq, r5, CompactSplitThread.PRIORITY_USER);
 
     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_BLOCKING);
+    addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
 
     getAndCheckRegion(pq, r3);
     getAndCheckRegion(pq, r1);
@@ -205,7 +205,7 @@ public class TestPriorityCompactionQueue
     // we can handle negative priorities
     addRegion(pq, r1, CompactSplitThread.PRIORITY_USER);
     addRegion(pq, r2, -1);
-    addRegion(pq, r3, CompactSplitThread.PRIORITY_BLOCKING);
+    addRegion(pq, r3, CompactSplitThread.PRIORITY_USER);
     addRegion(pq, r4, -2);
 
     getAndCheckRegion(pq, r4);