From 28433bf336a24338fc5c0e2acdabbaac74287bb4 Mon Sep 17 00:00:00 2001
From: sears <sears@8dad8b1f-cf64-0410-95b6-bcf113ffbcfe>
Date: Sat, 13 Mar 2010 00:41:37 +0000
Subject: [PATCH] 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
---
 datapage.cpp              | 4 ++++
 diskTreeComponent.h       | 2 --
 logiterators.cpp          | 3 ---
 logiterators.h            | 4 ----
 logstore.cpp              | 5 +----
 logstore.h                | 2 --
 merger.cpp                | 1 -
 server.cpp                | 1 -
 test/check_logtable.cpp   | 1 -
 test/check_merge.cpp      | 1 -
 test/check_mergelarge.cpp | 1 -
 test/check_mergetuple.cpp | 1 -
 test/check_rbtree.cpp     | 1 -
 13 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 logiterators.cpp
 delete mode 100644 logiterators.h

diff --git a/datapage.cpp b/datapage.cpp
index a2b916a..da84fe5 100644
--- a/datapage.cpp
+++ b/datapage.cpp
@@ -326,3 +326,7 @@ void DataPage<TUPLE>::RecordIterator::advance(int xid, int count)
 	  read_offset_ += len;
 	}
 }*/
+
+
+template class DataPage<datatuple>;
+
diff --git a/diskTreeComponent.h b/diskTreeComponent.h
index 2629795..f449e39 100644
--- a/diskTreeComponent.h
+++ b/diskTreeComponent.h
@@ -23,8 +23,6 @@
 #include "tuplemerger.h"
 #include "datatuple.h"
 
-#include "logiterators.h"
-
 class diskTreeComponent {
  public:
   class internalNodes;
diff --git a/logiterators.cpp b/logiterators.cpp
deleted file mode 100644
index 320dd1f..0000000
--- a/logiterators.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "logstore.h"
-#include "logiterators.h"
-#include "memTreeComponent.h"
diff --git a/logiterators.h b/logiterators.h
deleted file mode 100644
index 2066811..0000000
--- a/logiterators.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LOG_ITERATORS_H_
-#define _LOG_ITERATORS_H_
-
-#endif
diff --git a/logstore.cpp b/logstore.cpp
index 2871cf1..a712de5 100644
--- a/logstore.cpp
+++ b/logstore.cpp
@@ -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)
 {
 
diff --git a/logstore.h b/logstore.h
index 1c89b3a..9f86a3d 100644
--- a/logstore.h
+++ b/logstore.h
@@ -36,8 +36,6 @@
 #include "tuplemerger.h"
 #include "datatuple.h"
 
-#include "logiterators.h"
-
 #include "merger.h"
 
 template<class TUPLE>
diff --git a/merger.cpp b/merger.cpp
index 12dc04d..9b5cfd2 100644
--- a/merger.cpp
+++ b/merger.cpp
@@ -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;
diff --git a/server.cpp b/server.cpp
index 30fe611..a0d8fbf 100644
--- a/server.cpp
+++ b/server.cpp
@@ -4,7 +4,6 @@
 #include <sstream>
 #include "logstore.h"
 #include "datapage.h"
-#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_logtable.cpp b/test/check_logtable.cpp
index d7112ed..15317b0 100644
--- a/test/check_logtable.cpp
+++ b/test/check_logtable.cpp
@@ -5,7 +5,6 @@
 #include <sstream>
 #include "logstore.h"
 #include "datapage.h"
-#include "logiterators.h"
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
diff --git a/test/check_merge.cpp b/test/check_merge.cpp
index 4f925f6..3de38cf 100644
--- a/test/check_merge.cpp
+++ b/test/check_merge.cpp
@@ -4,7 +4,6 @@
 #include <sstream>
 #include "logstore.h"
 #include "datapage.h"
-#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_mergelarge.cpp b/test/check_mergelarge.cpp
index 0440010..0d5c471 100644
--- a/test/check_mergelarge.cpp
+++ b/test/check_mergelarge.cpp
@@ -4,7 +4,6 @@
 #include <sstream>
 #include "logstore.h"
 #include "datapage.h"
-#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_mergetuple.cpp b/test/check_mergetuple.cpp
index ee18452..2293e3c 100644
--- a/test/check_mergetuple.cpp
+++ b/test/check_mergetuple.cpp
@@ -4,7 +4,6 @@
 #include <sstream>
 #include "logstore.h"
 #include "datapage.h"
-#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_rbtree.cpp b/test/check_rbtree.cpp
index 43be575..881085b 100644
--- a/test/check_rbtree.cpp
+++ b/test/check_rbtree.cpp
@@ -4,7 +4,6 @@
 #include <sstream>
 #include "logstore.h"
 #include "datapage.h"
-#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>