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

fix compiler warnings. This commit makes use of an API change, and requires Stasis >= r1352

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@561 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2010-02-11 21:38:05 +00:00
parent f2df52319d
commit d769bc0de6
5 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
logserver.cpp
View file

@ -484,7 +484,6 @@ void * thread_work_fn( void * args)
//pthread_mutex_unlock(item->data->table_lock);
//unlock(item->data->table_lock);
//step 4: send response
uint8_t rcode = LOGSTORE_RESPONSE_SUCCESS;
int err = writeoptosocket(*(item->data->workitem), LOGSTORE_RESPONSE_SUCCESS);
if(err) {
perror("could not respond to client");

4
logstore.cpp
View file

@ -373,9 +373,7 @@ recordid logtree::appendPage(int xid, recordid tree, pageid_t & rmLeafID,
for(int i = *stasis_page_slotted_numslots_ptr(p)-1; i>FIRST_SLOT; i--)
{
assert(*stasis_page_slotted_numslots_ptr(p) > FIRST_SLOT+1);
const indexnode_rec *nr = (const indexnode_rec*)readRecord(xid,p,i,0);
int reclen = readRecordLength(xid, p, i);
recordid tmp_rec= {p->id, i, reclen};
recordid tmp_rec= {p->id, i, INVALID_SIZE};
stasis_record_free(xid, p, tmp_rec);
}

3
merger.cpp
View file

@ -308,7 +308,6 @@ void* memMergeThread(void*arg)
continue;
}
uint64_t insertedTuples=0;
int64_t mergedPages=0;
assert(a->my_tree.size != -1);
@ -517,8 +516,6 @@ void *diskMergeThread(void*arg)
break;
}
uint64_t insertedTuples=0;
int64_t mergedPages=0;
assert(a->my_tree.size != -1);

3
test/check_mergetuple.cpp
View file

@ -127,10 +127,7 @@ void insertProbeIter(size_t NUM_ENTRIES)
struct timeval start_tv, stop_tv, ti_st, ti_end;
double insert_time = 0;
int dpages = 0;
int npages = 0;
int delcount = 0, upcount = 0;
DataPage<datatuple> *dp=0;
int64_t datasize = 0;
std::vector<pageid_t> dsp;
std::vector<int> del_list;

7
test/check_tcpclient.cpp
View file

@ -29,10 +29,6 @@ void insertProbeIter(size_t NUM_ENTRIES)
logstore_handle_t * l = logstore_client_open(svrname, svrport, 100);
double delete_freq = .05;
double update_freq = .15;
//data generation
typedef std::vector<std::string> key_v_t;
const static size_t max_partition_size = 100000;
@ -106,8 +102,6 @@ void insertProbeIter(size_t NUM_ENTRIES)
struct timeval start_tv, stop_tv, ti_st, ti_end;
double insert_time = 0;
int dpages = 0;
int npages = 0;
int delcount = 0, upcount = 0;
int64_t datasize = 0;
std::vector<pageid_t> dsp;
@ -163,7 +157,6 @@ void insertProbeIter(size_t NUM_ENTRIES)
//get the key
datatuple::len_t keylen = (*key_arr)[ri].length()+1;
datatuple::len_t datalen = 0;
datatuple* searchtuple = datatuple::create((*key_arr)[ri].c_str(), keylen);