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

documentation cleanup

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@2448 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2011-04-22 17:39:52 +00:00
parent 38f1793eaa
commit 4f74dfd45f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tuplemerger.cpp
View file

@ -1,7 +1,8 @@
#include "tuplemerger.h"
#include "logstore.h"
// XXX test / reason about this...
// t2 is the newer tuple.
// we return deletes here. our caller decides what to do with them.
datatuple* tuplemerger::merge(const datatuple *t1, const datatuple *t2)
{
datatuple *t;
@ -21,9 +22,7 @@ datatuple* tuplemerger::merge(const datatuple *t1, const datatuple *t2)
}
return t;
}
/**
* appends the data in t2 to data from t1
*