Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert HBASE-5569 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1301872 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2012-03-17 06:59:31 +00:00
parent f34edd6378
commit fda76c71cb
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
View File

@ -308,8 +308,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) {

18
src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
View File

@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.client.Put;
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 HBaseTestCase {
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 HBaseTestCase {
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 HBaseTestCase {
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);