From b52dbe0636be99d1f723068bb04839513f8bd353 Mon Sep 17 00:00:00 2001 From: sears Date: Thu, 23 Feb 2012 01:25:24 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 2 +- blsm.cpp => bLSM.cpp | 4 ++-- blsm.h => bLSM.h | 2 +- datapage.cpp => dataPage.cpp | 4 ++-- datapage.h => dataPage.h | 2 +- datatuple.h => dataTuple.h | 0 diskTreeComponent.cpp | 2 +- diskTreeComponent.h | 4 ++-- memTreeComponent.cpp | 2 +- mergeManager.cpp | 2 +- mergeManager.h | 2 +- merger.cpp => mergeScheduler.cpp | 2 +- merger.h => mergeScheduler.h | 2 +- mergeStats.cpp | 4 ++-- mergeStats.h | 4 ++-- servers/mapkeeper/Makefile | 2 +- .../{blsmRequestHandler.cpp => bLSMRequestHandler.cpp} | 6 +++--- .../{blsmRequestHandler.h => bLSMRequestHandler.h} | 0 servers/mapkeeper/main/blsm_server.cpp | 6 +++--- test/check_datapage.cpp | 4 ++-- test/check_gen.cpp | 2 +- test/check_logtable.cpp | 4 ++-- test/check_logtree.cpp | 2 +- test/check_merge.cpp | 6 +++--- test/check_mergelarge.cpp | 6 +++--- test/check_mergetuple.cpp | 6 +++--- test/check_rbtree.cpp | 6 +++--- test/check_testAndSet.cpp | 4 ++-- tuplemerger.cpp => tupleMerger.cpp | 4 ++-- tuplemerger.h => tupleMerger.h | 0 30 files changed, 48 insertions(+), 48 deletions(-) rename blsm.cpp => bLSM.cpp (99%) rename blsm.h => bLSM.h (99%) rename datapage.cpp => dataPage.cpp (99%) rename datapage.h => dataPage.h (99%) rename datatuple.h => dataTuple.h (100%) rename merger.cpp => mergeScheduler.cpp (99%) rename merger.h => mergeScheduler.h (98%) rename servers/mapkeeper/{blsmRequestHandler.cpp => bLSMRequestHandler.cpp} (99%) rename servers/mapkeeper/{blsmRequestHandler.h => bLSMRequestHandler.h} (100%) rename tuplemerger.cpp => tupleMerger.cpp (97%) rename tuplemerger.h => tupleMerger.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5ac71b..e7f9787 100644 --- a/CMakeLists.txt +++ b/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 ) diff --git a/blsm.cpp b/bLSM.cpp similarity index 99% rename from blsm.cpp rename to bLSM.cpp index 17d4e87..d6b93ff 100644 --- a/blsm.cpp +++ b/bLSM.cpp @@ -16,8 +16,8 @@ * limitations under the License. * */ -#include "blsm.h" -#include "merger.h" +#include "bLSM.h" +#include "mergeScheduler.h" #include #include diff --git a/blsm.h b/bLSM.h similarity index 99% rename from blsm.h rename to bLSM.h index c92896f..57f45d0 100644 --- a/blsm.h +++ b/bLSM.h @@ -25,7 +25,7 @@ #include "diskTreeComponent.h" #include "memTreeComponent.h" -#include "tuplemerger.h" +#include "tupleMerger.h" #include "mergeManager.h" #include "mergeStats.h" diff --git a/datapage.cpp b/dataPage.cpp similarity index 99% rename from datapage.cpp rename to dataPage.cpp index e5b4a65..02e6f46 100644 --- a/datapage.cpp +++ b/dataPage.cpp @@ -17,8 +17,8 @@ * * Author: makdere */ -#include "blsm.h" -#include "datapage.h" +#include "bLSM.h" +#include "dataPage.h" #include "regionAllocator.h" #include diff --git a/datapage.h b/dataPage.h similarity index 99% rename from datapage.h rename to dataPage.h index 3888eb9..4b4a320 100644 --- a/datapage.h +++ b/dataPage.h @@ -24,7 +24,7 @@ #include #include -#include "datatuple.h" +#include "dataTuple.h" #include "regionAllocator.h" //#define CHECK_FOR_SCRIBBLING diff --git a/datatuple.h b/dataTuple.h similarity index 100% rename from datatuple.h rename to dataTuple.h diff --git a/diskTreeComponent.cpp b/diskTreeComponent.cpp index 35e547e..0487709 100644 --- a/diskTreeComponent.cpp +++ b/diskTreeComponent.cpp @@ -24,7 +24,7 @@ #include #include -#include "merger.h" +#include "mergeScheduler.h" #include "diskTreeComponent.h" #include "regionAllocator.h" diff --git a/diskTreeComponent.h b/diskTreeComponent.h index db15d21..d2a9af3 100644 --- a/diskTreeComponent.h +++ b/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 diff --git a/memTreeComponent.cpp b/memTreeComponent.cpp index faef714..5b9100c 100644 --- a/memTreeComponent.cpp +++ b/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; diff --git a/mergeManager.cpp b/mergeManager.cpp index 632260e..8855a5a 100644 --- a/mergeManager.cpp +++ b/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 diff --git a/mergeManager.h b/mergeManager.h index b453c18..ea16a24 100644 --- a/mergeManager.h +++ b/mergeManager.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include class bLSM; class mergeStats; diff --git a/merger.cpp b/mergeScheduler.cpp similarity index 99% rename from merger.cpp rename to mergeScheduler.cpp index 6317bb2..d24813c 100644 --- a/merger.cpp +++ b/mergeScheduler.cpp @@ -17,7 +17,7 @@ * */ #include -#include "merger.h" +#include "mergeScheduler.h" #include diff --git a/merger.h b/mergeScheduler.h similarity index 98% rename from merger.h rename to mergeScheduler.h index c7750ee..06d94bb 100644 --- a/merger.h +++ b/mergeScheduler.h @@ -19,7 +19,7 @@ #ifndef _MERGER_H_ #define _MERGER_H_ -#include "blsm.h" +#include "bLSM.h" #include diff --git a/mergeStats.cpp b/mergeStats.cpp index 6a7dbc1..97a4f7e 100644 --- a/mergeStats.cpp +++ b/mergeStats.cpp @@ -20,7 +20,7 @@ */ #include "mergeStats.h" -#include "blsm.h" -#include "datatuple.h" +#include "bLSM.h" +#include "dataTuple.h" diff --git a/mergeStats.h b/mergeStats.h index 2aa0eb3..1126b2f 100644 --- a/mergeStats.h +++ b/mergeStats.h @@ -28,8 +28,8 @@ #include #include -#include "datatuple.h" -#include "datapage.h" +#include "dataTuple.h" +#include "dataPage.h" #include // XXX for double_to_ts, etc... create a util class. diff --git a/servers/mapkeeper/Makefile b/servers/mapkeeper/Makefile index 8dc751d..18fe69e 100644 --- a/servers/mapkeeper/Makefile +++ b/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 diff --git a/servers/mapkeeper/blsmRequestHandler.cpp b/servers/mapkeeper/bLSMRequestHandler.cpp similarity index 99% rename from servers/mapkeeper/blsmRequestHandler.cpp rename to servers/mapkeeper/bLSMRequestHandler.cpp index 5eee448..bc41016 100644 --- a/servers/mapkeeper/blsmRequestHandler.cpp +++ b/servers/mapkeeper/bLSMRequestHandler.cpp @@ -22,9 +22,9 @@ #include #include -#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. diff --git a/servers/mapkeeper/blsmRequestHandler.h b/servers/mapkeeper/bLSMRequestHandler.h similarity index 100% rename from servers/mapkeeper/blsmRequestHandler.h rename to servers/mapkeeper/bLSMRequestHandler.h diff --git a/servers/mapkeeper/main/blsm_server.cpp b/servers/mapkeeper/main/blsm_server.cpp index d466610..8057c4e 100644 --- a/servers/mapkeeper/main/blsm_server.cpp +++ b/servers/mapkeeper/main/blsm_server.cpp @@ -7,9 +7,9 @@ #include #include #include -#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; diff --git a/test/check_datapage.cpp b/test/check_datapage.cpp index 69f30cd..ef320a1 100644 --- a/test/check_datapage.cpp +++ b/test/check_datapage.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/test/check_gen.cpp b/test/check_gen.cpp index 6606d1d..cd99ddd 100644 --- a/test/check_gen.cpp +++ b/test/check_gen.cpp @@ -18,7 +18,7 @@ * Author: sears */ #include -#include "blsm.h" +#include "bLSM.h" #include "regionAllocator.h" int main(int argc, char **argv) diff --git a/test/check_logtable.cpp b/test/check_logtable.cpp index 4940043..b64e58c 100644 --- a/test/check_logtable.cpp +++ b/test/check_logtable.cpp @@ -22,8 +22,8 @@ #include #include #include -#include "blsm.h" -#include "datapage.h" +#include "bLSM.h" +#include "dataPage.h" #include #include #include diff --git a/test/check_logtree.cpp b/test/check_logtree.cpp index f9c8b4b..be53411 100644 --- a/test/check_logtree.cpp +++ b/test/check_logtree.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "blsm.h" +#include "bLSM.h" #include "regionAllocator.h" #include "diskTreeComponent.h" diff --git a/test/check_merge.cpp b/test/check_merge.cpp index d3696d0..3fe4973 100644 --- a/test/check_merge.cpp +++ b/test/check_merge.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "blsm.h" -#include "datapage.h" -#include "merger.h" +#include "bLSM.h" +#include "dataPage.h" +#include "mergeScheduler.h" #include #include #include diff --git a/test/check_mergelarge.cpp b/test/check_mergelarge.cpp index f7d9fe3..c3b5b1d 100644 --- a/test/check_mergelarge.cpp +++ b/test/check_mergelarge.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "blsm.h" -#include "datapage.h" -#include "merger.h" +#include "bLSM.h" +#include "dataPage.h" +#include "mergeScheduler.h" #include #include #include diff --git a/test/check_mergetuple.cpp b/test/check_mergetuple.cpp index 68111d6..3ce351c 100644 --- a/test/check_mergetuple.cpp +++ b/test/check_mergetuple.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "blsm.h" -#include "datapage.h" -#include "merger.h" +#include "bLSM.h" +#include "dataPage.h" +#include "mergeScheduler.h" #include #include #include diff --git a/test/check_rbtree.cpp b/test/check_rbtree.cpp index f4380f6..ae7296a 100644 --- a/test/check_rbtree.cpp +++ b/test/check_rbtree.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "blsm.h" -#include "datapage.h" -#include "merger.h" +#include "bLSM.h" +#include "dataPage.h" +#include "mergeScheduler.h" #include #include #include diff --git a/test/check_testAndSet.cpp b/test/check_testAndSet.cpp index ebd635f..9081faa 100644 --- a/test/check_testAndSet.cpp +++ b/test/check_testAndSet.cpp @@ -23,8 +23,8 @@ #include #include #include -#include "datapage.h" -#include "merger.h" +#include "dataPage.h" +#include "mergeScheduler.h" #include #include #include diff --git a/tuplemerger.cpp b/tupleMerger.cpp similarity index 97% rename from tuplemerger.cpp rename to tupleMerger.cpp index dba6d4a..d452d58 100644 --- a/tuplemerger.cpp +++ b/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. diff --git a/tuplemerger.h b/tupleMerger.h similarity index 100% rename from tuplemerger.h rename to tupleMerger.h