Skip to content
Browse files

cannonicalize filenames (so they match the classes they define)

git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@3786 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
  • Loading branch information...
1 parent 9b1df5b commit b52dbe0636be99d1f723068bb04839513f8bd353 sears committed Feb 23, 2012
View
2 CMakeLists.txt
@@ -80,5 +80,5 @@ ENDIF ( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
IF ( HAVE_STASIS )
- ADD_LIBRARY(blsm blsm.cpp diskTreeComponent.cpp memTreeComponent.cpp datapage.cpp merger.cpp tuplemerger.cpp mergeStats.cpp mergeManager.cpp bloomFilter.c)
+ ADD_LIBRARY(blsm bLSM.cpp diskTreeComponent.cpp memTreeComponent.cpp dataPage.cpp mergeScheduler.cpp tupleMerger.cpp mergeStats.cpp mergeManager.cpp bloomFilter.c)
ENDIF ( HAVE_STASIS )
View
4 blsm.cpp → bLSM.cpp
@@ -16,8 +16,8 @@
* limitations under the License.
*
*/
-#include "blsm.h"
-#include "merger.h"
+#include "bLSM.h"
+#include "mergeScheduler.h"
#include <stasis/transactional.h>
#include <stasis/bufferManager.h>
View
2 blsm.h → bLSM.h
@@ -25,7 +25,7 @@
#include "diskTreeComponent.h"
#include "memTreeComponent.h"
-#include "tuplemerger.h"
+#include "tupleMerger.h"
#include "mergeManager.h"
#include "mergeStats.h"
View
4 datapage.cpp → dataPage.cpp
@@ -17,8 +17,8 @@
*
* Author: makdere
*/
-#include "blsm.h"
-#include "datapage.h"
+#include "bLSM.h"
+#include "dataPage.h"
#include "regionAllocator.h"
#include <stasis/page.h>
View
2 datapage.h → dataPage.h
@@ -24,7 +24,7 @@
#include <stasis/page.h>
#include <stasis/constants.h>
-#include "datatuple.h"
+#include "dataTuple.h"
#include "regionAllocator.h"
//#define CHECK_FOR_SCRIBBLING
View
0 datatuple.h → dataTuple.h
File renamed without changes.
View
2 diskTreeComponent.cpp
@@ -24,7 +24,7 @@
#include <math.h>
#include <ctype.h>
-#include "merger.h"
+#include "mergeScheduler.h"
#include "diskTreeComponent.h"
#include "regionAllocator.h"
View
4 diskTreeComponent.h
@@ -22,8 +22,8 @@
#ifndef DISKTREECOMPONENT_H_
#define DISKTREECOMPONENT_H_
-#include "datapage.h"
-#include "datatuple.h"
+#include "dataPage.h"
+#include "dataTuple.h"
#include "mergeStats.h"
#include "bloomFilter.h"
#include <stasis/util/crc32.h>
View
2 memTreeComponent.cpp
@@ -17,7 +17,7 @@
*
*/
#include "memTreeComponent.h"
-#include "datatuple.h"
+#include "dataTuple.h"
void memTreeComponent::tearDownTree(rbtree_ptr_t tree) {
dataTuple * t = 0;
View
2 mergeManager.cpp
@@ -21,7 +21,7 @@
#include "mergeManager.h"
#include "mergeStats.h"
-#include "blsm.h"
+#include "bLSM.h"
#include "math.h"
#include "time.h"
#include <stasis/transactional.h>
View
2 mergeManager.h
@@ -25,7 +25,7 @@
#include <stasis/common.h>
#include <sys/time.h>
#include <stdio.h>
-#include <datatuple.h>
+#include <dataTuple.h>
class bLSM;
class mergeStats;
View
2 merger.cpp → mergeScheduler.cpp
@@ -17,7 +17,7 @@
*
*/
#include <math.h>
-#include "merger.h"
+#include "mergeScheduler.h"
#include <stasis/transactional.h>
View
2 merger.h → mergeScheduler.h
@@ -19,7 +19,7 @@
#ifndef _MERGER_H_
#define _MERGER_H_
-#include "blsm.h"
+#include "bLSM.h"
#include <stasis/common.h>
View
4 mergeStats.cpp
@@ -20,7 +20,7 @@
*/
#include "mergeStats.h"
-#include "blsm.h"
-#include "datatuple.h"
+#include "bLSM.h"
+#include "dataTuple.h"
View
4 mergeStats.h
@@ -28,8 +28,8 @@
#include <sys/time.h>
#include <stdio.h>
-#include "datatuple.h"
-#include "datapage.h"
+#include "dataTuple.h"
+#include "dataPage.h"
#include <mergeManager.h> // XXX for double_to_ts, etc... create a util class.
View
2 servers/mapkeeper/Makefile
@@ -16,7 +16,7 @@ all: main/blsm_client main/blsm_server
main/blsm_client :
-main/blsm_server : blsmRequestHandler.cpp
+main/blsm_server : bLSMRequestHandler.cpp
clean:
rm -f main/blsm_client main/blsm_server
View
6 servers/mapkeeper/blsmRequestHandler.cpp → servers/mapkeeper/bLSMRequestHandler.cpp
@@ -22,9 +22,9 @@
#include <iostream>
#include <signal.h>
-#include "merger.h"
-#include "blsm.h"
-#include "blsmRequestHandler.h"
+#include "mergeScheduler.h"
+#include "bLSM.h"
+#include "bLSMRequestHandler.h"
int blind_update = 0; // updates check preimage by default.
View
0 servers/mapkeeper/blsmRequestHandler.h → servers/mapkeeper/bLSMRequestHandler.h
File renamed without changes.
View
6 servers/mapkeeper/main/blsm_server.cpp
@@ -7,9 +7,9 @@
#include <transport/TBufferTransports.h>
#include <concurrency/ThreadManager.h>
#include <concurrency/PosixThreadFactory.h>
-#include "blsm.h"
-#include "datatuple.h"
-#include "blsmRequestHandler.h"
+#include "bLSM.h"
+#include "dataTuple.h"
+#include "bLSMRequestHandler.h"
using namespace ::apache::thrift;
using namespace ::apache::thrift::protocol;
View
4 test/check_datapage.cpp
@@ -22,8 +22,8 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include <blsm.h>
-#include <datapage.h>
+#include <bLSM.h>
+#include <dataPage.h>
#include <assert.h>
#include <limits.h>
View
2 test/check_gen.cpp
@@ -18,7 +18,7 @@
* Author: sears
*/
#include <stasis/transactional.h>
-#include "blsm.h"
+#include "bLSM.h"
#include "regionAllocator.h"
int main(int argc, char **argv)
View
4 test/check_logtable.cpp
@@ -22,8 +22,8 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include "blsm.h"
-#include "datapage.h"
+#include "bLSM.h"
+#include "dataPage.h"
#include <assert.h>
#include <limits.h>
#include <math.h>
View
2 test/check_logtree.cpp
@@ -22,7 +22,7 @@
#include <iostream>
#include <algorithm>
#include <sstream>
-#include "blsm.h"
+#include "bLSM.h"
#include "regionAllocator.h"
#include "diskTreeComponent.h"
View
6 test/check_merge.cpp
@@ -22,9 +22,9 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include "blsm.h"
-#include "datapage.h"
-#include "merger.h"
+#include "bLSM.h"
+#include "dataPage.h"
+#include "mergeScheduler.h"
#include <assert.h>
#include <limits.h>
#include <math.h>
View
6 test/check_mergelarge.cpp
@@ -22,9 +22,9 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include "blsm.h"
-#include "datapage.h"
-#include "merger.h"
+#include "bLSM.h"
+#include "dataPage.h"
+#include "mergeScheduler.h"
#include <assert.h>
#include <limits.h>
#include <math.h>
View
6 test/check_mergetuple.cpp
@@ -22,9 +22,9 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include "blsm.h"
-#include "datapage.h"
-#include "merger.h"
+#include "bLSM.h"
+#include "dataPage.h"
+#include "mergeScheduler.h"
#include <assert.h>
#include <limits.h>
#include <math.h>
View
6 test/check_rbtree.cpp
@@ -22,9 +22,9 @@
#include <iostream>
#include <sstream>
#include <algorithm>
-#include "blsm.h"
-#include "datapage.h"
-#include "merger.h"
+#include "bLSM.h"
+#include "dataPage.h"
+#include "mergeScheduler.h"
#include <assert.h>
#include <limits.h>
#include <math.h>
View
4 test/check_testAndSet.cpp
@@ -23,8 +23,8 @@
#include <vector>
#include <iostream>
#include <sstream>
-#include "datapage.h"
-#include "merger.h"
+#include "dataPage.h"
+#include "mergeScheduler.h"
#include <assert.h>
#include <limits.h>
#include <math.h>
View
4 tuplemerger.cpp → tupleMerger.cpp
@@ -16,8 +16,8 @@
* limitations under the License.
*
*/
-#include "tuplemerger.h"
-#include "blsm.h"
+#include "tupleMerger.h"
+#include "bLSM.h"
// t2 is the newer tuple.
// we return deletes here. our caller decides what to do with them.
View
0 tuplemerger.h → tupleMerger.h
File renamed without changes.

0 comments on commit b52dbe0

Please sign in to comment.
Something went wrong with that request. Please try again.