greg/stasis-bLSM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logtableIterator now drops tombstone tuples by default

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@642 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2010-02-26 17:45:31 +00:00
parent c07c1486ef
commit 51df61f8e9
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
logstore.h
View file

@ -221,7 +221,7 @@ public:
if(!merge_) {
ret = current_[min];
} else {
// use merge function to build a new ret.
// XXX use merge function to build a new ret.
abort();
}
// advance the iterators that match the tuple we're returning.
@ -283,24 +283,32 @@ public:
invalidate();
if(last_returned) TUPLE::freetuple(last_returned);
}
TUPLE * getnext() {
readlock(ltable->header_lock, 0);
revalidate();
private:
TUPLE * getnextHelper() {
TUPLE * tmp = merge_it_->getnext();
if(last_returned && tmp) {
assert(TUPLE::compare(last_returned->key(), last_returned->keylen(), tmp->key(), tmp->keylen()) < 0);
TUPLE::freetuple(last_returned);
}
last_returned = tmp;
return last_returned;
}
public:
TUPLE * getnextIncludingTombstones() {
readlock(ltable->header_lock, 0);
revalidate();
TUPLE * ret = getnextHelper();
unlock(ltable->header_lock);
if(last_returned) {
TUPLE * ret = last_returned->create_copy(); // XXX hate making copy! Caller should not manage our memory.
return ret;
} else {
return NULL;
return ret ? ret->create_copy() : NULL;
}
TUPLE * getnext() {
readlock(ltable->header_lock, 0);
revalidate();
TUPLE * ret;
while((ret = getnextHelper()) && ret->isDelete()) { } // getNextHelper handles its own memory.
unlock(ltable->header_lock);
return ret ? ret->create_copy() : NULL; // XXX hate making copy! Caller should not manage our memory.
}
void invalidate() {