Organizing rocksdb/db directory

Summary: Pull Request resolved: facebook#5390

Differential Revision: D15579388

Pulled By: vjnadimpalli

fbshipit-source-id: 5bfc95e31554b8ff05b97b76d6534113f527f366

CMakeLists.txt

@@ -486,24 +486,24 @@ set(SOURCES
         db/c.cc
         db/column_family.cc
         db/compacted_db_impl.cc
-        db/compaction.cc
-        db/compaction_iterator.cc
-        db/compaction_job.cc
-        db/compaction_picker.cc
-        db/compaction_picker_fifo.cc
-        db/compaction_picker_level.cc
-        db/compaction_picker_universal.cc
+        db/compaction/compaction.cc
+        db/compaction/compaction_iterator.cc
+        db/compaction/compaction_picker.cc        
+        db/compaction/compaction_job.cc
+        db/compaction/compaction_picker_fifo.cc
+        db/compaction/compaction_picker_level.cc
+        db/compaction/compaction_picker_universal.cc
         db/convenience.cc
         db/db_filesnapshot.cc
-        db/db_impl.cc
-        db/db_impl_write.cc
-        db/db_impl_compaction_flush.cc
-        db/db_impl_files.cc
-        db/db_impl_open.cc
-        db/db_impl_debug.cc
-        db/db_impl_experimental.cc
-        db/db_impl_readonly.cc
-        db/db_impl_secondary.cc
+        db/db_impl/db_impl.cc
+        db/db_impl/db_impl_write.cc
+        db/db_impl/db_impl_compaction_flush.cc
+        db/db_impl/db_impl_files.cc
+        db/db_impl/db_impl_open.cc
+        db/db_impl/db_impl_debug.cc
+        db/db_impl/db_impl_experimental.cc
+        db/db_impl/db_impl_readonly.cc
+        db/db_impl/db_impl_secondary.cc
         db/db_info_dumper.cc
         db/db_iter.cc
         db/dbformat.cc
@@ -868,10 +868,10 @@ if(WITH_TESTS)
         cache/lru_cache_test.cc
         db/column_family_test.cc
         db/compact_files_test.cc
-        db/compaction_iterator_test.cc
-        db/compaction_job_stats_test.cc
-        db/compaction_job_test.cc
-        db/compaction_picker_test.cc
+        db/compaction/compaction_job_stats_test.cc
+        db/compaction/compaction_job_test.cc
+        db/compaction/compaction_iterator_test.cc
+        db/compaction/compaction_picker_test.cc
         db/comparator_db_test.cc
         db/corruption_test.cc
         db/cuckoo_table_db_test.cc
@@ -894,7 +894,7 @@ if(WITH_TESTS)
         db/db_options_test.cc
         db/db_properties_test.cc
         db/db_range_del_test.cc
-        db/db_secondary_test.cc
+        db/db_impl/db_secondary_test.cc
         db/db_sst_test.cc
         db/db_statistics_test.cc
         db/db_table_properties_test.cc

Makefile

@@ -1339,13 +1339,13 @@ write_batch_with_index_test: utilities/write_batch_with_index/write_batch_with_i
 flush_job_test: db/flush_job_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-compaction_iterator_test: db/compaction_iterator_test.o $(LIBOBJECTS) $(TESTHARNESS)
+compaction_iterator_test: db/compaction/compaction_iterator_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-compaction_job_test: db/compaction_job_test.o $(LIBOBJECTS) $(TESTHARNESS)
+compaction_job_test: db/compaction/compaction_job_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-compaction_job_stats_test: db/compaction_job_stats_test.o $(LIBOBJECTS) $(TESTHARNESS)
+compaction_job_stats_test: db/compaction/compaction_job_stats_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 compact_on_deletion_collector_test: utilities/table_properties_collectors/compact_on_deletion_collector_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1417,7 +1417,7 @@ version_edit_test: db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS)
 version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-compaction_picker_test: db/compaction_picker_test.o $(LIBOBJECTS) $(TESTHARNESS)
+compaction_picker_test: db/compaction/compaction_picker_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 version_builder_test: db/version_builder_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1585,7 +1585,7 @@ range_tombstone_fragmenter_test: db/range_tombstone_fragmenter_test.o db/db_test
 sst_file_reader_test: table/sst_file_reader_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-db_secondary_test: db/db_secondary_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
+db_secondary_test: db/db_impl/db_secondary_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 #-------------------------------------------------

TARGETS

@@ -83,24 +83,24 @@ cpp_library(
         "db/c.cc",
         "db/column_family.cc",
         "db/compacted_db_impl.cc",
-        "db/compaction.cc",
-        "db/compaction_iterator.cc",
-        "db/compaction_job.cc",
-        "db/compaction_picker.cc",
-        "db/compaction_picker_fifo.cc",
-        "db/compaction_picker_level.cc",
-        "db/compaction_picker_universal.cc",
+        "db/compaction/compaction.cc",
+        "db/compaction/compaction_iterator.cc",
+        "db/compaction/compaction_job.cc",
+        "db/compaction/compaction_picker.cc",
+        "db/compaction/compaction_picker_fifo.cc",
+        "db/compaction/compaction_picker_level.cc",
+        "db/compaction/compaction_picker_universal.cc",
         "db/convenience.cc",
         "db/db_filesnapshot.cc",
-        "db/db_impl.cc",
-        "db/db_impl_compaction_flush.cc",
-        "db/db_impl_debug.cc",
-        "db/db_impl_experimental.cc",
-        "db/db_impl_files.cc",
-        "db/db_impl_open.cc",
-        "db/db_impl_readonly.cc",
-        "db/db_impl_secondary.cc",
-        "db/db_impl_write.cc",
+        "db/db_impl/db_impl.cc",
+        "db/db_impl/db_impl_compaction_flush.cc",
+        "db/db_impl/db_impl_debug.cc",
+        "db/db_impl/db_impl_experimental.cc",
+        "db/db_impl/db_impl_files.cc",
+        "db/db_impl/db_impl_open.cc",
+        "db/db_impl/db_impl_readonly.cc",
+        "db/db_impl/db_impl_secondary.cc",
+        "db/db_impl/db_impl_write.cc",
         "db/db_info_dumper.cc",
         "db/db_iter.cc",
         "db/dbformat.cc",
@@ -454,22 +454,22 @@ ROCKS_TESTS = [
     ],
     [
         "compaction_iterator_test",
-        "db/compaction_iterator_test.cc",
+        "db/compaction/compaction_iterator_test.cc",
         "serial",
     ],
     [
         "compaction_job_stats_test",
-        "db/compaction_job_stats_test.cc",
+        "db/compaction/compaction_job_stats_test.cc",
         "serial",
     ],
     [
         "compaction_job_test",
-        "db/compaction_job_test.cc",
+        "db/compaction/compaction_job_test.cc",
         "serial",
     ],
     [
         "compaction_picker_test",
-        "db/compaction_picker_test.cc",
+        "db/compaction/compaction_picker_test.cc",
         "serial",
     ],
     [
@@ -609,7 +609,7 @@ ROCKS_TESTS = [
     ],
     [
         "db_secondary_test",
-        "db/db_secondary_test.cc",
+        "db/db_impl/db_secondary_test.cc",
         "serial",
     ],
     [

db/builder.cc

@@ -13,7 +13,7 @@
 #include <deque>
 #include <vector>
 
-#include "db/compaction_iterator.h"
+#include "db/compaction/compaction_iterator.h"
 #include "db/dbformat.h"
 #include "db/event_helpers.h"
 #include "db/internal_stats.h"

db/column_family.cc

@@ -19,11 +19,11 @@
 #include <algorithm>
 #include <limits>
 
-#include "db/compaction_picker.h"
-#include "db/compaction_picker_fifo.h"
-#include "db/compaction_picker_level.h"
-#include "db/compaction_picker_universal.h"
-#include "db/db_impl.h"
+#include "db/compaction/compaction_picker.h"
+#include "db/compaction/compaction_picker_fifo.h"
+#include "db/compaction/compaction_picker_level.h"
+#include "db/compaction/compaction_picker_universal.h"
+#include "db/db_impl/db_impl.h"
 #include "db/internal_stats.h"
 #include "db/job_context.h"
 #include "db/range_del_aggregator.h"

db/column_family_test.cc

@@ -12,8 +12,8 @@
 #include <string>
 #include <thread>
 
-#include "db/db_impl.h"
 #include "db/db_test_util.h"
+#include "db/db_impl/db_impl.h"
 #include "memtable/hash_skiplist_rep.h"
 #include "options/options_parser.h"
 #include "port/port.h"

db/compact_files_test.cc

@@ -10,7 +10,7 @@
 #include <thread>
 #include <vector>
 
-#include "db/db_impl.h"
+#include "db/db_impl/db_impl.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"

db/compacted_db_impl.cc

@@ -5,7 +5,7 @@
 
 #ifndef ROCKSDB_LITE
 #include "db/compacted_db_impl.h"
-#include "db/db_impl.h"
+#include "db/db_impl/db_impl.h"
 #include "db/version_set.h"
 #include "table/get_context.h"
 

db/compacted_db_impl.h

@@ -5,7 +5,7 @@
 
 #pragma once
 #ifndef ROCKSDB_LITE
-#include "db/db_impl.h"
+#include "db/db_impl/db_impl.h"
 #include <vector>
 #include <string>
 

db/compaction.cc → db/compaction/compaction.cc

@@ -7,8 +7,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "db/compaction.h"
-
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
@@ -17,6 +15,7 @@
 #include <vector>
 
 #include "db/column_family.h"
+#include "db/compaction/compaction.h"
 #include "rocksdb/compaction_filter.h"
 #include "test_util/sync_point.h"
 #include "util/string_util.h"

db/compaction_iterator.cc → db/compaction/compaction_iterator.cc

@@ -3,8 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "db/compaction_iterator.h"
-
+#include "db/compaction/compaction_iterator.h"
 #include "db/snapshot_checker.h"
 #include "port/likely.h"
 #include "rocksdb/listener.h"

db/compaction_iterator.h → db/compaction/compaction_iterator.h

@@ -10,8 +10,8 @@
 #include <unordered_set>
 #include <vector>
 
-#include "db/compaction.h"
-#include "db/compaction_iteration_stats.h"
+#include "db/compaction/compaction_iteration_stats.h"
+#include "db/compaction/compaction.h"
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
 #include "db/range_del_aggregator.h"

db/compaction_iterator_test.cc → db/compaction/compaction_iterator_test.cc

@@ -3,11 +3,11 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "db/compaction_iterator.h"
 
 #include <string>
 #include <vector>
 
+#include "db/compaction/compaction_iterator.h"
 #include "port/port.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"

db/compaction_job.cc → db/compaction/compaction_job.cc

@@ -7,7 +7,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "db/compaction_job.h"
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
@@ -24,8 +23,9 @@
 #include <utility>
 #include <vector>
 
+#include "db/compaction/compaction_job.h"
 #include "db/builder.h"
-#include "db/db_impl.h"
+#include "db/db_impl/db_impl.h"
 #include "db/db_iter.h"
 #include "db/dbformat.h"
 #include "db/error_handler.h"

db/compaction_job.h → db/compaction/compaction_job.h

@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "db/column_family.h"
-#include "db/compaction_iterator.h"
+#include "db/compaction/compaction_iterator.h"
 #include "db/dbformat.h"
 #include "db/flush_scheduler.h"
 #include "db/internal_stats.h"

db/compaction_job_stats_test.cc → db/compaction/compaction_job_stats_test.cc

@@ -21,7 +21,7 @@
 #include <unordered_set>
 #include <utility>
 
-#include "db/db_impl.h"
+#include "db/db_impl/db_impl.h"
 #include "db/dbformat.h"
 #include "db/job_context.h"
 #include "db/version_set.h"

db/compaction_job_test.cc → db/compaction/compaction_job_test.cc

@@ -17,7 +17,7 @@
 #include <tuple>
 
 #include "db/column_family.h"
-#include "db/compaction_job.h"
+#include "db/compaction/compaction_job.h"
 #include "db/error_handler.h"
 #include "db/version_set.h"
 #include "rocksdb/cache.h"

db/compaction_picker.cc → db/compaction/compaction_picker.cc

@@ -7,7 +7,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "db/compaction_picker.h"
+#include "db/compaction/compaction_picker.h"
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS

db/compaction_picker.h → db/compaction/compaction_picker.h

@@ -15,7 +15,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "db/compaction.h"
+#include "db/compaction/compaction.h"
 #include "db/version_set.h"
 #include "options/cf_options.h"
 #include "rocksdb/env.h"

db/compaction_picker_fifo.cc → db/compaction/compaction_picker_fifo.cc

@@ -7,7 +7,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "db/compaction_picker_fifo.h"
+#include "db/compaction/compaction_picker_fifo.h"
 #ifndef ROCKSDB_LITE
 
 #ifndef __STDC_FORMAT_MACROS

db/compaction_picker_fifo.h → db/compaction/compaction_picker_fifo.h

@@ -10,7 +10,7 @@
 #pragma once
 #ifndef ROCKSDB_LITE
 
-#include "db/compaction_picker.h"
+#include "db/compaction/compaction_picker.h"
 
 namespace rocksdb {
 class FIFOCompactionPicker : public CompactionPicker {

db/compaction_picker_level.cc → db/compaction/compaction_picker_level.cc

@@ -7,8 +7,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "db/compaction_picker_level.h"
-
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
@@ -17,6 +15,7 @@
 #include <utility>
 #include <vector>
 
+#include "db/compaction/compaction_picker_level.h"
 #include "test_util/sync_point.h"
 #include "util/log_buffer.h"
 

db/compaction_picker_level.h → db/compaction/compaction_picker_level.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "db/compaction_picker.h"
+#include "db/compaction/compaction_picker.h"
 
 namespace rocksdb {
 // Picking compactions for leveled compaction. See wiki page