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

HBASE-808,809 MAX_VERSIONS not respected, and Deletall doesn't and inserts; fix misapplication of patch 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@685458 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-08-13 06:22:49 +00:00
parent 78b53558b8
commit aabc02c44b
1 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/org/apache/hadoop/hbase/regionserver/Memcache.java
View File

@ -548,20 +548,6 @@ class Memcache {
final long now) { final long now) {
ArrayList<Cell> result = new ArrayList<Cell>(); ArrayList<Cell> result = new ArrayList<Cell>();
List<HStoreKey> victims = new ArrayList<HStoreKey>(); List<HStoreKey> victims = new ArrayList<HStoreKey>();
// Handle special case where only one version wanted.
if (numVersions == 1) {
byte [] value = map.get(key);
if (!isDeleted(value)) {
// Filter out expired results
if (HStore.notExpiredAndNotInDeletes(ttl, key, now, deletes)) {
result.add(new Cell(value, key.getTimestamp()));
} else {
addVictim(victims, key);
}
} else {
deletes.add(key);
}
} else {
SortedMap<HStoreKey, byte[]> tailMap = map.tailMap(key); SortedMap<HStoreKey, byte[]> tailMap = map.tailMap(key);
for (Map.Entry<HStoreKey, byte[]> es : tailMap.entrySet()) { for (Map.Entry<HStoreKey, byte[]> es : tailMap.entrySet()) {
HStoreKey itKey = es.getKey(); HStoreKey itKey = es.getKey();
@ -585,7 +571,6 @@ class Memcache {
break; break;
} }
} }
}
// Remove expired victims from the map. // Remove expired victims from the map.
for (HStoreKey v: victims) { for (HStoreKey v: victims) {
map.remove(v); map.remove(v);