hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject svn commit: r1301873 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
Date Sat, 17 Mar 2012 07:00:11 GMT
Author: larsh
Date: Sat Mar 17 07:00:10 2012
New Revision: 1301873

URL: http://svn.apache.org/viewvc?rev=1301873&view=rev
Log:
Revert HBASE-5569

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.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/ScanQueryMatcher.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java?rev=1301873&r1=1301872&r2=1301873&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
(original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
Sat Mar 17 07:00:10 2012
@@ -306,8 +306,7 @@ public class ScanQueryMatcher {
       }
       // note the following next else if...
       // delete marker are not subject to other delete markers
-    } else if (!this.deletes.isEmpty()
-        && kv.getMemstoreTS() <= maxReadPointToTrackVersions) {
+    } else if (!this.deletes.isEmpty()) {
       DeleteResult deleteResult = deletes.isDeleted(bytes, offset, qualLength,
           timestamp);
       switch (deleteResult) {

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=1301873&r1=1301872&r2=1301873&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
Sat Mar 17 07:00:10 2012
@@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.client.Pu
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
 import org.junit.experimental.categories.Category;
 
@@ -54,7 +55,10 @@ public class TestAtomicOperation extends
 
   HRegion region = null;
   private HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
-  private final String DIR = TEST_UTIL.getDataTestDir("TestAtomicOperation").toString();
+  private final String DIR = TEST_UTIL.getDataTestDir("TestIncrement").toString();
+
+
+  private final int MAX_VERSIONS = 2;
 
   // Test names
   static final byte[] tableName = Bytes.toBytes("testtable");;
@@ -254,10 +258,10 @@ public class TestAtomicOperation extends
     LOG.info("Starting test testRowMutationMultiThreads");
     initHRegion(tableName, getName(), fam1);
 
-    // create 50 threads, each will alternate between adding and
+    // create 100 threads, each will alternate between adding and
     // removing a column
-    int numThreads = 50;
-    int opsPerThread = 500;
+    int numThreads = 100;
+    int opsPerThread = 1000;
     AtomicOperation[] all = new AtomicOperation[numThreads];
 
     AtomicLong timeStamps = new AtomicLong(0);
@@ -336,10 +340,10 @@ public class TestAtomicOperation extends
     LOG.info("Starting test testMultiRowMutationMultiThreads");
     initHRegion(tableName, getName(), fam1);
 
-    // create 50 threads, each will alternate between adding and
+    // create 100 threads, each will alternate between adding and
     // removing a column
-    int numThreads = 50;
-    int opsPerThread = 500;
+    int numThreads = 100;
+    int opsPerThread = 1000;
     AtomicOperation[] all = new AtomicOperation[numThreads];
 
     AtomicLong timeStamps = new AtomicLong(0);



Mime
View raw message