remove logiterators.h/cpp and stop #including datapage.cpp
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@690 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
parent
c8c48a188d
commit
28433bf336
13 changed files with 5 additions and 22 deletions
|
@ -326,3 +326,7 @@ void DataPage<TUPLE>::RecordIterator::advance(int xid, int count)
|
|||
read_offset_ += len;
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
template class DataPage<datatuple>;
|
||||
|
||||
|
|
|
@ -23,8 +23,6 @@
|
|||
#include "tuplemerger.h"
|
||||
#include "datatuple.h"
|
||||
|
||||
#include "logiterators.h"
|
||||
|
||||
class diskTreeComponent {
|
||||
public:
|
||||
class internalNodes;
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
#include "logstore.h"
|
||||
#include "logiterators.h"
|
||||
#include "memTreeComponent.h"
|
|
@ -1,4 +0,0 @@
|
|||
#ifndef _LOG_ITERATORS_H_
|
||||
#define _LOG_ITERATORS_H_
|
||||
|
||||
#endif
|
|
@ -5,8 +5,7 @@
|
|||
|
||||
#include "merger.h"
|
||||
#include "logstore.h"
|
||||
#include "logiterators.h"
|
||||
#include "datapage.cpp"
|
||||
#include "datapage.h"
|
||||
|
||||
#include <stasis/transactional.h>
|
||||
#include <stasis/page.h>
|
||||
|
@ -24,8 +23,6 @@ static inline double tv_to_double(struct timeval tv)
|
|||
// LOG TABLE IMPLEMENTATION
|
||||
/////////////////////////////////////////////////////////////////
|
||||
|
||||
template class DataPage<datatuple>;
|
||||
|
||||
logtable::logtable(pageid_t internal_region_size, pageid_t datapage_region_size, pageid_t datapage_size)
|
||||
{
|
||||
|
||||
|
|
|
@ -36,8 +36,6 @@
|
|||
#include "tuplemerger.h"
|
||||
#include "datatuple.h"
|
||||
|
||||
#include "logiterators.h"
|
||||
|
||||
#include "merger.h"
|
||||
|
||||
template<class TUPLE>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
#include <math.h>
|
||||
#include "merger.h"
|
||||
#include "logiterators.cpp"
|
||||
|
||||
void merge_stats_pp(FILE* fd, merge_stats_t &stats) {
|
||||
long long sleep_time = stats.start.tv_sec - stats.sleep.tv_sec;
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include <sstream>
|
||||
#include "logstore.h"
|
||||
#include "datapage.h"
|
||||
#include "logiterators.h"
|
||||
#include "merger.h"
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include <sstream>
|
||||
#include "logstore.h"
|
||||
#include "datapage.h"
|
||||
#include "logiterators.h"
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include <sstream>
|
||||
#include "logstore.h"
|
||||
#include "datapage.h"
|
||||
#include "logiterators.h"
|
||||
#include "merger.h"
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include <sstream>
|
||||
#include "logstore.h"
|
||||
#include "datapage.h"
|
||||
#include "logiterators.h"
|
||||
#include "merger.h"
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include <sstream>
|
||||
#include "logstore.h"
|
||||
#include "datapage.h"
|
||||
#include "logiterators.h"
|
||||
#include "merger.h"
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include <sstream>
|
||||
#include "logstore.h"
|
||||
#include "datapage.h"
|
||||
#include "logiterators.h"
|
||||
#include "merger.h"
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
|
Loading…
Reference in a new issue