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

Author: esmet

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>