FT-294 Move serialization code to its own subdirectory, serialize/

ft/CMakeLists.txt

@@ -24,21 +24,15 @@ add_custom_target(
 
 set(FT_SOURCES
   background_job_manager
-  block_allocator
-  block_table
   bndata
   cachetable
   checkpoint
-  compress
   cursor
   ft
   ft-cachetable-wrappers
   ft-flusher
   ft-hot-flusher
-  ft_node-serialize
-  ft-node-deserialize
   ft-ops
-  ft-serialize
   ft-test-helpers
   ft-verify
   loader/callbacks
@@ -55,14 +49,20 @@ set(FT_SOURCES
   msg_buffer
   node
   pivotkeys
-  quicklz
   recover
   rollback
   rollback-apply
   rollback-ct-callbacks
   rollback_log_node_cache
   roll
-  sub_block
+  serialize/block_allocator
+  serialize/block_table
+  serialize/compress
+  serialize/ft_node-serialize
+  serialize/ft-node-deserialize
+  serialize/ft-serialize
+  serialize/quicklz
+  serialize/sub_block
   txn
   txn_child_manager
   txn_manager

ft/bndata.h

@@ -90,10 +90,11 @@ PATENT RIGHTS GRANT:
 
 #pragma once
 
-#include <util/mempool.h>
-#include "wbuf.h"
-#include <util/dmt.h>
-#include "leafentry.h"
+#include "util/dmt.h"
+#include "util/mempool.h"
+
+#include "ft/leafentry.h"
+#include "ft/serialize/wbuf.h"
 
 // Key/leafentry pair stored in a dmt.  The key is inlined, the offset (in leafentry mempool) is stored for the leafentry.
 struct klpair_struct {

ft/cachetable.h

@@ -94,7 +94,7 @@ PATENT RIGHTS GRANT:
 
 #include <fcntl.h>
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/logger.h"
 #include "ft/txn.h"
 #include "util/minicron.h"

ft/ft-cachetable-wrappers.cc

@@ -89,7 +89,7 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/ft-cachetable-wrappers.h"
 #include "ft/ft-flusher.h"
 #include "ft/ft-internal.h"

ft/ft-flusher.cc

@@ -89,14 +89,14 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/block_table.h"
 #include "ft/ft.h"
 #include "ft/ft-cachetable-wrappers.h"
 #include "ft/ft-internal.h"
 #include "ft/ft-flusher.h"
 #include "ft/ft-flusher-internal.h"
-#include "ft/ft_node-serialize.h"
 #include "ft/node.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "portability/toku_assert.h"
 #include "portability/toku_atomic.h"
 #include "util/status.h"

ft/ft-internal.h

@@ -142,7 +142,7 @@ struct ft_header {
     // LSN of creation of "checkpoint-begin" record in log.
     LSN checkpoint_lsn;
 
-    // see ft_layout_version.h.  maybe don't need this if we assume
+    // see serialize/ft_layout_version.h.  maybe don't need this if we assume
     // it's always the current version after deserializing
     const int layout_version;
     // different (<) from layout_version if upgraded from a previous

ft/ft-ops.cc

@@ -200,21 +200,21 @@ basement nodes, bulk fetch,  and partial fetch:
 
 */
 
-#include "ft/block_table.h"
 #include "ft/checkpoint.h"
 #include "ft/cursor.h"
 #include "ft/ft.h"
 #include "ft/ft-cachetable-wrappers.h"
 #include "ft/ft-flusher.h"
 #include "ft/ft-internal.h"
-#include "ft/ft-serialize.h"
-#include "ft/ft_layout_version.h"
-#include "ft/ft_node-serialize.h"
 #include "ft/msg.h"
 #include "ft/leafentry.h"
 #include "ft/log-internal.h"
 #include "ft/node.h"
-#include "ft/sub_block.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/sub_block.h"
+#include "ft/serialize/ft-serialize.h"
+#include "ft/serialize/ft_layout_version.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/txn_manager.h"
 #include "ft/ule.h"
 #include "ft/xids.h"

ft/ft-test-helpers.cc

@@ -93,7 +93,7 @@ PATENT RIGHTS GRANT:
 #include "ft/ft-cachetable-wrappers.h"
 #include "ft/ft-internal.h"
 #include "ft/ft-flusher.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/node.h"
 #include "ft/ule.h"
 

ft/ft-verify.cc

@@ -97,7 +97,7 @@ PATENT RIGHTS GRANT:
  *   For each nonleaf node:  All the messages have keys that are between the associated pivot keys ( left_pivot_key < message <= right_pivot_key)
  */
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/ft.h"
 #include "ft/ft-cachetable-wrappers.h"
 #include "ft/ft-internal.h"

ft/ft.cc

@@ -89,15 +89,15 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/ft.h"
 #include "ft/ft-cachetable-wrappers.h"
 #include "ft/ft-internal.h"
-#include "ft/ft-serialize.h"
-#include "ft/ft_node-serialize.h"
 #include "ft/log-internal.h"
 #include "ft/log_header.h"
 #include "ft/node.h"
+#include "ft/serialize/ft-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 
 #include <memory.h>
 #include <toku_assert.h>

ft/ftverify.cc

@@ -98,14 +98,14 @@ PATENT RIGHTS GRANT:
 #include "portability/toku_list.h"
 #include "portability/toku_portability.h"
 
-#include "ft/block_allocator.h"
+#include "ft/serialize/block_allocator.h"
 #include "ft/ft-internal.h"
-#include "ft/ft-serialize.h"
-#include "ft/ft_layout_version.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft-serialize.h"
+#include "ft/serialize/ft_layout_version.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/node.h"
-#include "ft/rbuf.h"
-#include "ft/sub_block.h"
+#include "ft/serialize/rbuf.h"
+#include "ft/serialize/sub_block.h"
 #include "util/threadpool.h"
 
 #include <fcntl.h>

ft/leafentry.cc

@@ -89,7 +89,7 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "wbuf.h"
+#include "serialize/wbuf.h"
 #include "leafentry.h"
 
 void wbuf_nocrc_LEAFENTRY(struct wbuf *w, LEAFENTRY le) {

ft/leafentry.h

@@ -98,7 +98,7 @@ PATENT RIGHTS GRANT:
 #include <util/omt.h>
 
 #include "ft/txn_manager.h"
-#include "ft/rbuf.h"
+#include "ft/serialize/rbuf.h"
 #include "ft/msg.h"
 
 /*

ft/loader/dbufio.cc

@@ -97,7 +97,7 @@ PATENT RIGHTS GRANT:
 #include "portability/memory.h"
 
 #include "ft/ft-internal.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "loader/dbufio.h"
 #include "loader/loader-internal.h"
 

ft/loader/loader.cc

@@ -100,19 +100,19 @@ PATENT RIGHTS GRANT:
 #include <string.h>
 #include <fcntl.h>
 
-#include "ft/block_table.h"
 #include "ft/ft.h"
 #include "ft/ft-internal.h"
-#include "ft/ft-serialize.h"
-#include "ft/ft_node-serialize.h"
 #include "ft/leafentry.h"
 #include "ft/loader/loader-internal.h"
 #include "ft/loader/pqueue.h"
 #include "ft/loader/dbufio.h"
 #include "ft/log-internal.h"
 #include "ft/node.h"
-#include "ft/sub_block.h"
-#include "ft/sub_block_map.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/ft-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
+#include "ft/serialize/sub_block.h"
+#include "ft/serialize/sub_block_map.h"
 
 #include "util/x1764.h"
 

ft/log.h

@@ -106,14 +106,6 @@ PATENT RIGHTS GRANT:
 
 struct roll_entry;
 
-static inline int toku_copy_BYTESTRING(BYTESTRING *target, BYTESTRING val) {
-    target->len = val.len;
-    target->data = (char *) toku_memdup(val.data, (size_t)val.len);
-    if (target->data==0) {
-        return get_error_errno();
-    }
-    return 0;
-}
 static inline void toku_free_TXNID(TXNID txnid __attribute__((__unused__))) {}
 static inline void toku_free_TXNID_PAIR(TXNID_PAIR txnid __attribute__((__unused__))) {}
 

ft/logger.cc

@@ -94,7 +94,7 @@ PATENT RIGHTS GRANT:
 #include <limits.h>
 #include <unistd.h>
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/ft.h"
 #include "ft/log-internal.h"
 #include "ft/txn_manager.h"

ft/logger.h

@@ -92,8 +92,8 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/block_table.h"
-#include "ft/ft_layout_version.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/ft_layout_version.h"
 #include "ft/txn.h"
 
 typedef struct tokulogger *TOKULOGGER;
@@ -278,7 +278,7 @@ struct txn_manager *toku_logger_get_txn_manager(TOKULOGGER logger);
 
 // For serialize / deserialize
 
-#include "ft/wbuf.h"
+#include "ft/serialize/wbuf.h"
 
 static inline void wbuf_nocrc_FILENUM(struct wbuf *wb, FILENUM fileid) {
     wbuf_nocrc_uint(wb, fileid.fileid);
@@ -309,7 +309,7 @@ static inline void wbuf_nocrc_XIDP (struct wbuf *w, TOKU_XA_XID *xid) {
     wbuf_nocrc_literal_bytes(w, xid->data, xid->gtrid_length+xid->bqual_length);
 }
 
-#include "ft/rbuf.h"
+#include "ft/serialize/rbuf.h"
 
 static inline void rbuf_FILENUM(struct rbuf *rb, FILENUM *filenum) {
     filenum->fileid = rbuf_int(rb);

ft/msg.h

@@ -232,13 +232,13 @@ private:
 
 // For serialize / deserialize
 
-#include "ft/wbuf.h"
+#include "ft/serialize/wbuf.h"
 
 static inline void wbuf_MSN(struct wbuf *wb, MSN msn) {
     wbuf_ulonglong(wb, msn.msn);
 }
 
-#include "ft/rbuf.h"
+#include "ft/serialize/rbuf.h"
 
 static inline MSN rbuf_MSN(struct rbuf *rb) {
     MSN msn = { .msn = rbuf_ulonglong(rb) };

ft/node.cc

@@ -91,10 +91,10 @@ PATENT RIGHTS GRANT:
 
 #include "ft/ft.h"
 #include "ft/ft-internal.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/node.h"
-#include "ft/rbuf.h"
-#include "ft/wbuf.h"
+#include "ft/serialize/rbuf.h"
+#include "ft/serialize/wbuf.h"
 #include "util/scoped_malloc.h"
 #include "util/sort.h"
 

ft/pivotkeys.cc

@@ -94,8 +94,8 @@ PATENT RIGHTS GRANT:
 #include "portability/memory.h"
 
 #include "ft/node.h"
-#include "ft/rbuf.h"
-#include "ft/wbuf.h"
+#include "ft/serialize/rbuf.h"
+#include "ft/serialize/wbuf.h"
 
 void ftnode_pivot_keys::create_empty() {
     _num_pivots = 0;

ft/rollback-ct-callbacks.cc

@@ -92,9 +92,9 @@ PATENT RIGHTS GRANT:
 #include "portability/memory.h"
 #include "portability/toku_portability.h"
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/ft-internal.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/rollback.h"
 #include "ft/rollback-ct-callbacks.h"
 

ft/rollback.cc

@@ -91,7 +91,7 @@ PATENT RIGHTS GRANT:
 
 #include <toku_stdint.h>
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/ft.h"
 #include "ft/log-internal.h"
 #include "ft/rollback-ct-callbacks.h"

ft/rollback.h

@@ -93,7 +93,7 @@ PATENT RIGHTS GRANT:
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
 #include "ft/cachetable.h"
-#include "ft/sub_block.h"
+#include "ft/serialize/sub_block.h"
 #include "ft/txn.h"
 
 #include "util/memarena.h"

ft/block_allocator.cc → ft/serialize/block_allocator.cc

@@ -97,7 +97,7 @@ PATENT RIGHTS GRANT:
 #include "portability/toku_stdint.h"
 #include "portability/toku_stdlib.h"
 
-#include "ft/block_allocator.h"
+#include "ft/serialize/block_allocator.h"
 
 // Here's a very simple implementation.
 // It's not very fast at allocating or freeing.

ft/block_table.cc → ft/serialize/block_table.cc

@@ -94,13 +94,13 @@ PATENT RIGHTS GRANT:
 #include "portability/toku_assert.h"
 #include "portability/toku_pthread.h"
 
-#include "ft/block_allocator.h"
-#include "ft/block_table.h"
 #include "ft/ft-internal.h"        // ugly but pragmatic, need access to dirty bits while holding translation lock
 // TODO: reorganize this dependency
 #include "ft/ft-ops.h" // for toku_maybe_truncate_file
-#include "ft/rbuf.h"
-#include "ft/wbuf.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/rbuf.h"
+#include "ft/serialize/wbuf.h"
+#include "ft/serialize/block_allocator.h"
 
 #include "util/nb_mutex.h"
 

ft/block_table.h → ft/serialize/block_table.h

@@ -190,7 +190,7 @@ enum {
 
 // For serialize / deserialize
 
-#include "ft/wbuf.h"
+#include "ft/serialize/wbuf.h"
 
 static inline void wbuf_BLOCKNUM (struct wbuf *w, BLOCKNUM b) {
     wbuf_ulonglong(w, b.b);
@@ -204,7 +204,7 @@ static inline void wbuf_DISKOFF(struct wbuf *wb, DISKOFF off) {
     wbuf_ulonglong(wb, (uint64_t) off);
 }
 
-#include "ft/rbuf.h"
+#include "ft/serialize/rbuf.h"
 
 static inline DISKOFF rbuf_DISKOFF(struct rbuf *rb) {
     return rbuf_ulonglong(rb);

ft/ft-node-deserialize.cc → ft/serialize/ft-node-deserialize.cc

@@ -91,7 +91,7 @@ PATENT RIGHTS GRANT:
 
 #include "ft/node.h"
 #include "ft/ft-internal.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 
 /*
  * ft-node-deserialize.c -

ft/ft-serialize.cc → ft/serialize/ft-serialize.cc

@@ -89,13 +89,13 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/block_allocator.h"
-#include "ft/block_table.h"
-#include "ft/compress.h"
 #include "ft/ft.h"
 #include "ft/ft-internal.h"
-#include "ft/ft-serialize.h"
 #include "ft/msg.h"
+#include "ft/serialize/block_allocator.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/compress.h"
+#include "ft/serialize/ft-serialize.h"
 
 // not version-sensitive because we only serialize a descriptor using the current layout_version
 uint32_t

ft/ft-serialize.h → ft/serialize/ft-serialize.h

@@ -88,8 +88,8 @@ PATENT RIGHTS GRANT:
 
 #pragma once
 
-#include "ft/block_table.h"
 #include "ft/ft.h"
+#include "ft/serialize/block_table.h"
 
 size_t toku_serialize_ft_size(struct ft_header *h);
 void toku_serialize_ft_to(int fd, struct ft_header *h, struct block_table *blocktable, CACHEFILE cf);

ft/ft_node-serialize.cc → ft/serialize/ft_node-serialize.cc

@@ -89,16 +89,17 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/block_table.h"
+#include "portability/toku_atomic.h"
+
 #include "ft/cachetable.h"
-#include "ft/compress.h"
 #include "ft/ft.h"
 #include "ft/ft-internal.h"
-#include "ft/ft_node-serialize.h"
 #include "ft/node.h"
 #include "ft/log-internal.h"
 #include "ft/rollback.h"
-#include "portability/toku_atomic.h"
+#include "ft/serialize/block_table.h"
+#include "ft/serialize/compress.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "util/sort.h"
 #include "util/threadpool.h"
 #include "util/status.h"

ft/ft_node-serialize.h → ft/serialize/ft_node-serialize.h

@@ -88,12 +88,12 @@ PATENT RIGHTS GRANT:
 
 #pragma once
 
-#include "ft/block_table.h"
-#include "ft/node.h"
 #include "ft/ft.h"
-#include "ft/sub_block.h"
-#include "ft/rbuf.h"
-#include "ft/wbuf.h"
+#include "ft/node.h"
+#include "ft/serialize/sub_block.h"
+#include "ft/serialize/rbuf.h"
+#include "ft/serialize/wbuf.h"
+#include "ft/serialize/block_table.h"
 
 unsigned int toku_serialize_ftnode_size(FTNODE node);
 int toku_serialize_ftnode_to_memory(FTNODE node, FTNODE_DISK_DATA *ndd,

ft/sub_block.cc → ft/serialize/sub_block.cc

@@ -98,9 +98,9 @@ PATENT RIGHTS GRANT:
 #include "portability/toku_assert.h"
 #include "portability/toku_portability.h"
 
-#include "ft/compress.h"
-#include "ft/sub_block.h"
-#include "ft/quicklz.h"
+#include "ft/serialize/compress.h"
+#include "ft/serialize/sub_block.h"
+#include "ft/serialize/quicklz.h"
 #include "util/threadpool.h"
 #include "util/x1764.h"
 

ft/sub_block.h → ft/serialize/sub_block.h

@@ -92,7 +92,7 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "ft/compress.h"
+#include "ft/serialize/compress.h"
 
 // TODO: Clean this abstraciton up
 static const int max_sub_blocks = 8;

ft/tests/compress-test.cc

@@ -91,7 +91,7 @@ PATENT RIGHTS GRANT:
 #ident "$Id$"
 
 #include "test.h"
-#include "compress.h"
+#include "serialize/compress.h"
 
 static void test_compress_buf_method (unsigned char *buf, int i, enum toku_compression_method m) {
     int bound = toku_compress_bound(m, i);

ft/tests/quicklz-test.cc

@@ -91,7 +91,7 @@ PATENT RIGHTS GRANT:
 #ident "$Id$"
 
 #include "test.h"
-#include "quicklz.h"
+#include "serialize/quicklz.h"
 
 static void test_qlz_random_i (int i) {
     if (verbose) printf("i=%d\n", i);

ft/tests/subblock-test-checksum.cc

@@ -91,8 +91,8 @@ PATENT RIGHTS GRANT:
 
 #include "test.h"
 
-#include "compress.h"
-#include "sub_block.h"
+#include "serialize/compress.h"
+#include "serialize/sub_block.h"
 
 #include <toku_portability.h>
 #include <util/threadpool.h>

ft/tests/subblock-test-compression.cc

@@ -95,7 +95,7 @@ PATENT RIGHTS GRANT:
 #include <errno.h>
 #include <string.h>
 
-#include "sub_block.h"
+#include "serialize/sub_block.h"
 
 static void
 test_sub_block_compression(void *buf, int total_size, int my_max_sub_blocks, int n_cores, enum toku_compression_method method) {

ft/tests/subblock-test-index.cc

@@ -95,7 +95,7 @@ PATENT RIGHTS GRANT:
 #include <errno.h>
 #include <string.h>
 
-#include "sub_block.h"
+#include "serialize/sub_block.h"
 
 static void
 test_sub_block_index(void) {

ft/tests/subblock-test-size.cc

@@ -95,7 +95,7 @@ PATENT RIGHTS GRANT:
 #include <errno.h>
 #include <string.h>
 
-#include "sub_block.h"
+#include "serialize/sub_block.h"
 
 static void
 test_sub_block_size(int total_size) {

ft/tests/test.h

@@ -101,15 +101,15 @@ PATENT RIGHTS GRANT:
 #include <string.h>
 #include <portability/toku_path.h>
 
-#include "ft/block_allocator.h"
-#include "ft/block_table.h"
+#include "ft/serialize/block_allocator.h"
+#include "ft/serialize/block_table.h"
 #include "ft/cachetable.h"
 #include "ft/cachetable-internal.h"
 #include "ft/cursor.h"
 #include "ft/ft.h"
 #include "ft/ft-ops.h"
-#include "ft/ft-serialize.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/log-internal.h"
 #include "ft/logger.h"
 #include "ft/node.h"

ft/tests/test_block_allocator_merge.cc

@@ -87,7 +87,7 @@ PATENT RIGHTS GRANT:
 */
 
 #ident "Copyright (c) 2009-2013 Tokutek Inc.  All rights reserved."
-#include "../block_allocator.h"
+#include "ft/serialize/block_allocator.h"
 #include <memory.h>
 #include <assert.h>
 // Test the merger.

ft/tokuftdump.cc

@@ -98,12 +98,12 @@ PATENT RIGHTS GRANT:
 #include <inttypes.h>
 #include <limits.h>
 
-#include "ft/block_table.h"
+#include "ft/serialize/block_table.h"
 #include "ft/cachetable.h"
 #include "ft/ft.h"
 #include "ft/ft-internal.h"
-#include "ft/ft-serialize.h"
-#include "ft/ft_node-serialize.h"
+#include "ft/serialize/ft-serialize.h"
+#include "ft/serialize/ft_node-serialize.h"
 #include "ft/node.h"
 
 static int do_dump_data = 1;

ft/txn.h

@@ -94,8 +94,8 @@ PATENT RIGHTS GRANT:
 
 #include "portability/toku_stdint.h"
 
-#include "ft/block_table.h"
 #include "ft/txn_state.h"
+#include "ft/serialize/block_table.h"
 #include "util/omt.h"
 
 typedef uint64_t TXNID;
@@ -385,7 +385,7 @@ void txn_status_destroy(void);
 
 // For serialize / deserialize
 
-#include "ft/wbuf.h"
+#include "ft/serialize/wbuf.h"
 
 static inline void wbuf_TXNID(struct wbuf *wb, TXNID txnid) {
     wbuf_ulonglong(wb, txnid);
@@ -408,7 +408,7 @@ static inline void wbuf_LSN(struct wbuf *wb, LSN lsn) {
     wbuf_ulonglong(wb, lsn.lsn);
 }
 
-#include "ft/rbuf.h"
+#include "ft/serialize/rbuf.h"
 
 static inline void rbuf_TXNID(struct rbuf *rb, TXNID *txnid) {
     *txnid = rbuf_ulonglong(rb);

ft/xids.h

@@ -104,8 +104,8 @@ PATENT RIGHTS GRANT:
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
 #include "ft/txn.h"
-#include "ft/rbuf.h"
-#include "ft/wbuf.h"
+#include "ft/serialize/rbuf.h"
+#include "ft/serialize/wbuf.h"
 
 /* The number of transaction ids stored in the xids structure is 
  * represented by an 8-bit value.  The value 255 is reserved. 

util/dmt.h

@@ -90,14 +90,17 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include <stdint.h>
-#include <memory.h>
-#include <toku_portability.h>
-#include <toku_race_tools.h>
-#include "growable_array.h"
-#include "../ft/wbuf.h"
 #include <vector>
 
+#include "portability/memory.h"
+#include "portability/toku_portability.h"
+#include "portability/toku_race_tools.h"
+#include "portability/toku_stdint.h"
+
+#include "ft/serialize/wbuf.h"
+#include "util/growable_array.h"
+#include "util/mempool.h"
+
 namespace toku {
 typedef uint32_t node_offset;