svn commit: r1364502 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java

[la...@apache.org]

Author: larsh
Date: Mon Jul 23 05:24:52 2012
New Revision: 1364502

URL: http://svn.apache.org/viewvc?rev=1364502&view=rev
Log:
HBASE-5659 TestAtomicOperation.testMultiRowMutationMultiThreads is still failing occasionally

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
    hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=1364502&r1=1364501&r2=1364502&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Mon Jul 23 05:24:52 2012
@@ -469,7 +469,7 @@ class StoreScanner extends NonLazyKeyVal
     if (this.heap == null && this.lastTop != null) {
       resetScannerStack(this.lastTop);
       if (this.heap.peek() == null
-          || store.comparator.compare(this.lastTop, this.heap.peek()) != 0) {
+          || store.comparator.compareRows(this.lastTop, this.heap.peek()) != 0) {
         LOG.debug("Storescanner.peek() is changed where before = "
             + this.lastTop.toString() + ",and after = " + this.heap.peek());
         this.lastTop = null;

Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java?rev=1364502&r1=1364501&r2=1364502&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java Mon Jul 23 05:24:52 2012
@@ -255,7 +255,7 @@ public class TestAtomicOperation extends
     LOG.info("Starting test testRowMutationMultiThreads");
     initHRegion(tableName, getName(), fam1);
 
-    // create 100 threads, each will alternate between adding and
+    // create 10 threads, each will alternate between adding and
     // removing a column
     int numThreads = 10;
     int opsPerThread = 500;
@@ -339,10 +339,10 @@ public class TestAtomicOperation extends
     LOG.info("Starting test testMultiRowMutationMultiThreads");
     initHRegion(tableName, getName(), fam1);
 
-    // create 100 threads, each will alternate between adding and
+    // create 10 threads, each will alternate between adding and
     // removing a column
     int numThreads = 10;
-    int opsPerThread = 1000;
+    int opsPerThread = 500;
     AtomicOperation[] all = new AtomicOperation[numThreads];
 
     AtomicLong timeStamps = new AtomicLong(0);