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

fix for dropping first key in range scans

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@2554 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2011-05-13 17:57:05 +00:00
parent c4bf5a4995
commit 05ee405772
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
memTreeComponent.h
View file

@ -52,8 +52,8 @@ public:
private:
void init_iterators(rbtree_t * s, TUPLE * key1, TUPLE * key2) {
if(s) {
it_ = key1 ? new MTITER(s->find(key1)) : new MTITER(s->begin());
itend_ = key2 ? new MTITER(s->find(key2)) : new MTITER(s->end());
it_ = key1 ? new MTITER(s->lower_bound(key1)) : new MTITER(s->begin());
itend_ = key2 ? new MTITER(s->upper_bound(key2)) : new MTITER(s->end());
if(*it_ == *itend_) { done_ = true; }
if(key1) {
if(done_) {
@ -166,7 +166,7 @@ public:
it++;
}
}
void populate_next_ret(TUPLE *key=NULL) {
void populate_next_ret(TUPLE *key=NULL, bool include_key=false) {
if(cur_off_ == num_batched_) {
if(mut_) pthread_mutex_lock(mut_);
if(mgr_) {
@ -179,7 +179,7 @@ public:
}
}
if(key) {
populate_next_ret_impl(s_->upper_bound(key));
populate_next_ret_impl(include_key ? s_->lower_bound(key) : s_->upper_bound(key));
} else {
populate_next_ret_impl(s_->begin());
}
@ -194,7 +194,7 @@ public:
}
batchedRevalidatingIterator( rbtree_t *s, int batch_size, pthread_mutex_t * rb_mut, TUPLE *&key ) : s_(s), mgr_(NULL), target_size_(0), flushing_(0), batch_size_(batch_size), num_batched_(batch_size), cur_off_(batch_size), mut_(rb_mut) {
next_ret_ = (TUPLE**)malloc(sizeof(next_ret_[0]) * batch_size_);
populate_next_ret(key);
populate_next_ret(key, true);
}
~batchedRevalidatingIterator() {