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

fix comments + TODO in diskTreeComponent

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@665 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2010-03-05 20:46:20 +00:00
parent eba30f92a3
commit b75ad3675c
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
diskTreeComponent.cpp
View file

@ -63,7 +63,6 @@ void diskTreeComponent::deinit_stasis() { Tdeinit(); }
void diskTreeComponent::free_region_rid(int xid, recordid tree, void diskTreeComponent::free_region_rid(int xid, recordid tree,
diskTreeComponent_page_deallocator_t dealloc, void *allocator_state) diskTreeComponent_page_deallocator_t dealloc, void *allocator_state)
{ {
// Tdealloc(xid,tree);
dealloc(xid,allocator_state); dealloc(xid,allocator_state);
// XXX fishy shouldn't caller do this? // XXX fishy shouldn't caller do this?
Tdealloc(xid, *(recordid*)allocator_state); Tdealloc(xid, *(recordid*)allocator_state);
@ -83,7 +82,6 @@ void diskTreeComponent::dealloc_region_rid(int xid, recordid rid)
TregionDealloc(xid,pid); TregionDealloc(xid,pid);
} }
a.regionList.slot = 0; a.regionList.slot = 0;
// printf("Warning: leaking arraylist %lld in diskTreeComponent\n", (long long)a.regionList.page);
TarrayListDealloc(xid, a.regionList); TarrayListDealloc(xid, a.regionList);
} }
@ -714,19 +712,18 @@ recordid diskTreeComponent::lookup(int xid,
assert(*stasis_page_slotted_numslots_ptr(node) > FIRST_SLOT); assert(*stasis_page_slotted_numslots_ptr(node) > FIRST_SLOT);
int match = FIRST_SLOT; // don't need to compare w/ first item in tree, since we need to position ourselves at the the max tree value <= key.
// positioning at FIRST_SLOT puts us "before" the first value
// don't need to compare w/ first item in tree. int match = FIRST_SLOT; // (so match is now < key)
const indexnode_rec * rec = (indexnode_rec*)readRecord(xid,node,FIRST_SLOT,0); //TODO: why read it then?
for(int i = FIRST_SLOT+1; i < *stasis_page_slotted_numslots_ptr(node); i++) for(int i = FIRST_SLOT+1; i < *stasis_page_slotted_numslots_ptr(node); i++)
{ {
rec = (const indexnode_rec*)readRecord(xid,node,i,0); const indexnode_rec *rec = (const indexnode_rec*)readRecord(xid,node,i,0);
int cmpval = datatuple::compare((datatuple::key_t) (rec+1), *stasis_page_slotted_slot_length_ptr(node, i)-sizeof(*rec), int cmpval = datatuple::compare((datatuple::key_t) (rec+1), *stasis_page_slotted_slot_length_ptr(node, i)-sizeof(*rec),
(datatuple::key_t) key, keySize); (datatuple::key_t) key, keySize);
if(cmpval>0) //changed it from > if(cmpval>0) // key of current node is too big; there can be no matches under it.
break; break;
match = i; match = i; // only increment match after comparing with the current node.
} }