FT-247 Move files relating to the bulk loader to their own directory

ft/CMakeLists.txt

@@ -30,14 +30,11 @@ set(FT_SOURCES
   cachetable
   checkpoint
   compress
-  dbufio
   fifo
   ft
   ft-cachetable-wrappers
   ft-flusher
   ft-hot-flusher
-  ftloader
-  ftloader-callback
   ft_msg
   ft_node-serialize
   ft-node-deserialize
@@ -45,13 +42,16 @@ set(FT_SOURCES
   ft-serialize
   ft-test-helpers
   ft-verify
+  loader/callbacks
+  loader/dbufio
+  loader/loader
+  loader/pqueue
   leafentry
   le-cursor
   logcursor
   logfilemgr
   logger
   log_upgrade
-  pqueue
   quicklz
   recover
   rollback

ft/ftloader-callback.cc → ft/loader/callbacks.cc

@@ -95,7 +95,7 @@ PATENT RIGHTS GRANT:
 #include <errno.h>
 #include <string.h>
 
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include "ybt.h"
 
 static void error_callback_lock(ft_loader_error_callback loader_error) {

ft/dbufio.cc → ft/loader/dbufio.cc

@@ -89,14 +89,14 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2010-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 "dbufio.h"
+#include "loader/dbufio.h"
 #include "fttypes.h"
 #include <toku_assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include "memory.h"
 #include <string.h>
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include "ft-internal.h"
 #include "ft.h"
 

ft/ftloader-internal.h → ft/loader/loader-internal.h

@@ -92,10 +92,10 @@ PATENT RIGHTS GRANT:
 
 #include <db.h>
 #include "fttypes.h"
-#include "ftloader.h"
+#include "loader/loader.h"
 #include "util/queue.h"
 #include <toku_pthread.h>
-#include "dbufio.h"
+#include "loader/dbufio.h"
 
 enum { EXTRACTOR_QUEUE_DEPTH = 2,
        FILE_BUFFER_SIZE  = 1<<24,

ft/ftloader.cc → ft/loader/loader.cc

@@ -102,12 +102,12 @@ PATENT RIGHTS GRANT:
 
 #include <util/x1764.h>
 
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include "ft-internal.h"
 #include "sub_block.h"
 #include "sub_block_map.h"
-#include "pqueue.h"
-#include "dbufio.h"
+#include "loader/pqueue.h"
+#include "loader/dbufio.h"
 #include "leafentry.h"
 #include "log-internal.h"
 #include "ft.h"

ft/pqueue.cc → ft/loader/pqueue.cc

@@ -92,8 +92,8 @@ PATENT RIGHTS GRANT:
 #include <toku_portability.h>
 #include "toku_os.h"
 #include "ft-internal.h"
-#include "ftloader-internal.h"
-#include "pqueue.h"
+#include "loader/loader-internal.h"
+#include "loader/pqueue.h"
 
 #define pqueue_left(i)   ((i) << 1)
 #define pqueue_right(i)  (((i) << 1) + 1)

ft/tests/dbufio-test-destroy.cc

@@ -88,7 +88,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 "dbufio.h"
+#include "loader/dbufio.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <toku_assert.h>

ft/tests/dbufio-test.cc

@@ -88,7 +88,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 "dbufio.h"
+#include "loader/dbufio.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <toku_assert.h>

ft/tests/ftloader-test-bad-generate.cc

@@ -94,8 +94,8 @@ PATENT RIGHTS GRANT:
 #define DONT_DEPRECATE_MALLOC
 #define DONT_DEPRECATE_WRITES
 #include "test.h"
-#include "ftloader.h"
-#include "ftloader-internal.h"
+#include "loader/loader.h"
+#include "loader/loader-internal.h"
 #include "ftloader-error-injector.h"
 #include "memory.h"
 #include <portability/toku_path.h>

ft/tests/ftloader-test-extractor-errors.cc

@@ -95,8 +95,8 @@ PATENT RIGHTS GRANT:
 #define DONT_DEPRECATE_MALLOC
 #define DONT_DEPRECATE_WRITES
 #include "test.h"
-#include "ftloader.h"
-#include "ftloader-internal.h"
+#include "loader/loader.h"
+#include "loader/loader-internal.h"
 #include "ftloader-error-injector.h"
 #include "memory.h"
 #include <portability/toku_path.h>

ft/tests/ftloader-test-extractor.cc

@@ -95,8 +95,8 @@ PATENT RIGHTS GRANT:
 #define DONT_DEPRECATE_MALLOC
 #define DONT_DEPRECATE_WRITES
 #include "test.h"
-#include "ftloader.h"
-#include "ftloader-internal.h"
+#include "loader/loader.h"
+#include "loader/loader-internal.h"
 #include "memory.h"
 #include <portability/toku_path.h>
 

ft/tests/ftloader-test-merge-files-dbufio.cc

@@ -95,7 +95,7 @@ PATENT RIGHTS GRANT:
 #define DONT_DEPRECATE_MALLOC
 
 #include "test.h"
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include <portability/toku_path.h>
 
 static int event_count, event_count_trigger;

ft/tests/ftloader-test-open.cc

@@ -94,8 +94,8 @@ PATENT RIGHTS GRANT:
 
 #define DONT_DEPRECATE_MALLOC
 #include "test.h"
-#include "ftloader.h"
-#include "ftloader-internal.h"
+#include "loader/loader.h"
+#include "loader/loader-internal.h"
 #include "memory.h"
 #include <portability/toku_path.h>
 

ft/tests/ftloader-test-writer-errors.cc

@@ -95,7 +95,7 @@ PATENT RIGHTS GRANT:
 #define DONT_DEPRECATE_MALLOC
 
 #include "test.h"
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include "ftloader-error-injector.h"
 #include <portability/toku_path.h>
 

ft/tests/ftloader-test-writer.cc

@@ -93,7 +93,7 @@ PATENT RIGHTS GRANT:
 
 
 #include "test.h"
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include <inttypes.h>
 #include <portability/toku_path.h>
 

ft/tests/ftloader-test.cc

@@ -94,7 +94,7 @@ PATENT RIGHTS GRANT:
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "ftloader-internal.h"
+#include "loader/loader-internal.h"
 #include "memory.h"
 #include <portability/toku_path.h>
 

ft/tests/pqueue-test.cc

@@ -91,8 +91,8 @@ PATENT RIGHTS GRANT:
 
 #include "test.h"
 
-#include "ftloader-internal.h"
-#include "pqueue.h"
+#include "loader/loader-internal.h"
+#include "loader/pqueue.h"
 
 int found_dup = -1;
 

src/loader.cc

@@ -99,7 +99,7 @@ PATENT RIGHTS GRANT:
 #include <string.h>
 
 #include <ft/ft.h>
-#include <ft/ftloader.h>
+#include <ft/loader/loader.h>
 #include <ft/checkpoint.h>
 
 #include "ydb-internal.h"

src/ydb.cc

@@ -117,7 +117,7 @@ const char *toku_copyright_string = "Copyright (c) 2007-2013 Tokutek Inc.  All r
 #include <ft/cachetable.h>
 #include <ft/log.h>
 #include <ft/checkpoint.h>
-#include <ft/ftloader.h>
+#include <ft/loader/loader.h>
 #include <ft/log_header.h>
 #include <ft/ft.h>
 #include <ft/txn_manager.h>

src/ydb_env_func.cc

@@ -99,7 +99,7 @@ PATENT RIGHTS GRANT:
 #include <ft/ft-flusher.h>
 #include <ft/checkpoint.h>
 #include <ft/recover.h>
-#include <ft/ftloader.h>
+#include <ft/loader/loader.h>
 
 #include "ydb_env_func.h"