move compression and latchFree page formats to experimental/

benchmarks/rose.cpp

@@ -11,11 +11,11 @@
 //typedef int32_t val_t; // rose executable's input contains 32 bit values
 typedef int64_t val_t;   // rose executable's input contains 64 bit values
 #include "stasis/experimental/lsmTree.h"
-#include "stasis/page/compression/for-impl.h"
-#include "stasis/page/compression/pstar-impl.h"
-#include "stasis/page/compression/rle-impl.h"
-#include "stasis/page/compression/multicolumn-impl.h"
-#include "stasis/page/compression/tuple.h"
+#include "stasis/experimental/compression/for-impl.h"
+#include "stasis/experimental/compression/pstar-impl.h"
+#include "stasis/experimental/compression/rle-impl.h"
+#include "stasis/experimental/compression/multicolumn-impl.h"
+#include "stasis/experimental/compression/tuple.h"
 
 #include "stasis/experimental/lsmIterators.h"
 

benchmarks/roseTable.cpp

@@ -1,7 +1,7 @@
 //#define LEAK_TEST
 
 #include "roseTable.h"
-#include "stasis/page/compression/compression.h"
+#include "stasis/experimental/compression/compression.h"
 
 int main(int argc, char **argv) {
 

benchmarks/roseTable.h

@@ -5,13 +5,13 @@
 
 #include "stasis/transactional.h"
 
-#include "stasis/page/compression/nop.h"
-#include "stasis/page/compression/multicolumn-impl.h"
-#include "stasis/page/compression/staticMulticolumn.h"
-#include "stasis/page/compression/for-impl.h"
-#include "stasis/page/compression/rle-impl.h"
-#include "stasis/page/compression/staticTuple.h"
-#include "stasis/page/compression/pageLayout.h"
+#include "stasis/experimental/compression/nop.h"
+#include "stasis/experimental/compression/multicolumn-impl.h"
+#include "stasis/experimental/compression/staticMulticolumn.h"
+#include "stasis/experimental/compression/for-impl.h"
+#include "stasis/experimental/compression/rle-impl.h"
+#include "stasis/experimental/compression/staticTuple.h"
+#include "stasis/experimental/compression/pageLayout.h"
 
 namespace rose {
 

benchmarks/roseTableTpcCH-workload1.cpp

@@ -5,7 +5,7 @@
 #define XID_COL 4
 
 #include "roseTableTpcCH.h"
-#include "stasis/page/compression/compression.h"
+#include "stasis/experimental/compression/compression.h"
 
 int main(int argc, char **argv) {
 

benchmarks/roseTableTpcCH-workload2.cpp

@@ -3,7 +3,7 @@
 #define XID_COL 254 // XXX
 
 #include "roseTableTpcCH.h"
-#include "stasis/page/compression/compression.h"
+#include "stasis/experimental/compression/compression.h"
 
 int main(int argc, char **argv) {
 

benchmarks/roseTableTpcCH.h

@@ -5,13 +5,13 @@
 
 #include "stasis/transactional.h"
 
-#include "stasis/page/compression/nop.h"
-#include "stasis/page/compression/multicolumn-impl.h"
-#include "stasis/page/compression/staticMulticolumn.h"
-#include "stasis/page/compression/for-impl.h"
-#include "stasis/page/compression/rle-impl.h"
-#include "stasis/page/compression/staticTuple.h"
-#include "stasis/page/compression/pageLayout.h"
+#include "stasis/experimental/compression/nop.h"
+#include "stasis/experimental/compression/multicolumn-impl.h"
+#include "stasis/experimental/compression/staticMulticolumn.h"
+#include "stasis/experimental/compression/for-impl.h"
+#include "stasis/experimental/compression/rle-impl.h"
+#include "stasis/experimental/compression/staticTuple.h"
+#include "stasis/experimental/compression/pageLayout.h"
 
 namespace rose {
   template<class PAGELAYOUT>

src/stasis/CMakeLists.txt

@@ -23,7 +23,7 @@ ADD_LIBRARY(stasis crc32.c redblack.c lhtable.c concurrentHash.c rw.c doubleLink
                    page/raw.c
                    page/lsnFree.c
                    page/segment.c
-                   page/latchFree/lfSlotted.c
+                   experimental/latchFree/lfSlotted.c
                    operations/pageOperations.c
                    operations/decrement.c operations/increment.c
                    operations/prepare.c operations/set.c

src/stasis/experimental/latchFree/lfSlotted.c

@@ -8,7 +8,7 @@
 #include <config.h>
 #include <stasis/common.h>
 #include <stasis/page.h>
-#include <stasis/page/latchFree/lfSlotted.h>
+#include <stasis/experimental/latchFree/lfSlotted.h>
 
 #ifdef HAVE_GCC_ATOMICS
 #define CAS(_a,_o,_n) __sync_bool_compare_and_swap(_a,_o,_n)

src/stasis/page.c

@@ -76,7 +76,7 @@ terms specified in this license.
 #include <stasis/page/slotted.h>
 #include <stasis/page/fixed.h>
 #include <stasis/page/uninitialized.h>
-#include <stasis/page/latchFree/lfSlotted.h>
+#include <stasis/experimental/latchFree/lfSlotted.h>
 #include <stasis/operations/arrayList.h>
 #include <stasis/bufferPool.h>
 #include <stasis/truncation.h>

stasis/experimental/compression/for-impl.h

@@ -1,7 +1,7 @@
 #ifndef _ROSE_COMPRESSION_FOR_IMPL_H__
 #define _ROSE_COMPRESSION_FOR_IMPL_H__
 
-#include <stasis/page/compression/binary_search.h>
+#include <stasis/experimental/compression/binary_search.h>
 
 // Copyright 2007 Google Inc. All Rights Reserved.
 // Author: sears@google.com (Rusty Sears)

stasis/experimental/lsmIterators.h

@@ -3,8 +3,8 @@
 
 #include <stasis/page.h>
 #include <stasis/bufferManager.h>
-#include <stasis/page/compression/compression.h>
-#include <stasis/page/compression/tuple.h>
+#include <stasis/experimental/compression/compression.h>
+#include <stasis/experimental/compression/tuple.h>
 #include <stasis/operations.h>
 
 #include "lsmTree.h"

test/stasis/check_page.c

@@ -48,7 +48,7 @@ terms specified in this license.
 
 #include <stasis/page.h>
 #include <stasis/page/slotted.h>
-#include <stasis/page/latchFree/lfSlotted.h>
+#include <stasis/experimental/latchFree/lfSlotted.h>
 #include <stasis/blobManager.h>
 #include <stasis/bufferManager.h>
 #include <stasis/transactional.h>