Organizing rocksdb/table directory by format

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/5373 Differential Revision: D15559425 Pulled By: vjnadimpalli fbshipit-source-id: 5d6d6d615582bedd96a4b879bb25d429a6de8b55
6 years ago · 50e470791d
parent e62986260f
commit 50e470791d
98 changed files with 292 additions and 275 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -566,36 +566,36 @@ set(SOURCES
        options/options_parser.cc
        options/options_sanity_check.cc
        port/stack_trace.cc
-        table/adaptive_table_factory.cc
-        table/block.cc
-        table/block_based_filter_block.cc
-        table/block_based_table_builder.cc
-        table/block_based_table_factory.cc
-        table/block_based_table_reader.cc
-        table/block_builder.cc
+        table/adaptive/adaptive_table_factory.cc
+        table/block_based/block.cc
+        table/block_based/block_based_filter_block.cc
+        table/block_based/block_based_table_builder.cc
+        table/block_based/block_based_table_factory.cc
+        table/block_based/block_based_table_reader.cc
+        table/block_based/block_builder.cc
+        table/block_based/block_prefix_index.cc
+        table/block_based/data_block_hash_index.cc
+        table/block_based/data_block_footer.cc
+        table/block_based/flush_block_policy.cc
+        table/block_based/full_filter_block.cc
+        table/block_based/index_builder.cc
+        table/block_based/partitioned_filter_block.cc
        table/block_fetcher.cc
-        table/block_prefix_index.cc
        table/bloom_block.cc
-        table/cuckoo_table_builder.cc
-        table/cuckoo_table_factory.cc
-        table/cuckoo_table_reader.cc
-        table/data_block_hash_index.cc
-        table/data_block_footer.cc
-        table/flush_block_policy.cc
+        table/cuckoo/cuckoo_table_builder.cc
+        table/cuckoo/cuckoo_table_factory.cc
+        table/cuckoo/cuckoo_table_reader.cc
        table/format.cc
-        table/full_filter_block.cc
        table/get_context.cc
-        table/index_builder.cc
        table/iterator.cc
        table/merging_iterator.cc
        table/meta_blocks.cc
-        table/partitioned_filter_block.cc
        table/persistent_cache_helper.cc
-        table/plain_table_builder.cc
-        table/plain_table_factory.cc
-        table/plain_table_index.cc
-        table/plain_table_key_coding.cc
-        table/plain_table_reader.cc
+        table/plain/plain_table_builder.cc
+        table/plain/plain_table_factory.cc
+        table/plain/plain_table_index.cc
+        table/plain/plain_table_key_coding.cc
+        table/plain/plain_table_reader.cc
        table/sst_file_reader.cc
        table/sst_file_writer.cc
        table/table_properties.cc
@ -940,13 +940,14 @@ if(WITH_TESTS)
        monitoring/statistics_test.cc
        options/options_settable_test.cc
        options/options_test.cc
-        table/block_based_filter_block_test.cc
-        table/block_test.cc
+        table/block_based/block_based_filter_block_test.cc
+        table/block_based/block_test.cc
+        table/block_based/data_block_hash_index_test.cc
+        table/block_based/full_filter_block_test.cc
+       	table/block_based/partitioned_filter_block_test.cc 	
        table/cleanable_test.cc
-        table/cuckoo_table_builder_test.cc
-        table/cuckoo_table_reader_test.cc
-        table/data_block_hash_index_test.cc
-        table/full_filter_block_test.cc
+        table/cuckoo/cuckoo_table_builder_test.cc
+        table/cuckoo/cuckoo_table_reader_test.cc
        table/merger_test.cc
        table/sst_file_reader_test.cc
        table/table_test.cc
--- a/14
+++ b/14
@ -1378,13 +1378,13 @@ filename_test: db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS)
 file_reader_writer_test: util/file_reader_writer_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-block_based_filter_block_test: table/block_based_filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
+block_based_filter_block_test: table/block_based/block_based_filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-full_filter_block_test: table/full_filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
+full_filter_block_test: table/block_based/full_filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-partitioned_filter_block_test: table/partitioned_filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
+partitioned_filter_block_test: table/block_based/partitioned_filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

 log_test: db/log_test.o $(LIBOBJECTS) $(TESTHARNESS)
@ -1396,10 +1396,10 @@ cleanable_test: table/cleanable_test.o $(LIBOBJECTS) $(TESTHARNESS)
 table_test: table/table_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-block_test: table/block_test.o $(LIBOBJECTS) $(TESTHARNESS)
+block_test: table/block_based/block_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-data_block_hash_index_test: table/data_block_hash_index_test.o $(LIBOBJECTS) $(TESTHARNESS)
+data_block_hash_index_test: table/block_based/data_block_hash_index_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

 inlineskiplist_test: memtable/inlineskiplist_test.o $(LIBOBJECTS) $(TESTHARNESS)
@ -1465,10 +1465,10 @@ rocksdb_dump: tools/dump/rocksdb_dump.o $(LIBOBJECTS)
 rocksdb_undump: tools/dump/rocksdb_undump.o $(LIBOBJECTS)
 	$(AM_LINK)

-cuckoo_table_builder_test: table/cuckoo_table_builder_test.o $(LIBOBJECTS) $(TESTHARNESS)
+cuckoo_table_builder_test: table/cuckoo/cuckoo_table_builder_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-cuckoo_table_reader_test: table/cuckoo_table_reader_test.o $(LIBOBJECTS) $(TESTHARNESS)
+cuckoo_table_reader_test: table/cuckoo/cuckoo_table_reader_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

 cuckoo_table_db_test: db/cuckoo_table_db_test.o $(LIBOBJECTS) $(TESTHARNESS)
--- a/58
+++ b/58
@ -173,36 +173,36 @@ cpp_library(
        "options/options_sanity_check.cc",
        "port/port_posix.cc",
        "port/stack_trace.cc",
-        "table/adaptive_table_factory.cc",
-        "table/block.cc",
-        "table/block_based_filter_block.cc",
-        "table/block_based_table_builder.cc",
-        "table/block_based_table_factory.cc",
-        "table/block_based_table_reader.cc",
-        "table/block_builder.cc",
+        "table/adaptive/adaptive_table_factory.cc",
+        "table/block_based/block.cc",
+        "table/block_based/block_based_filter_block.cc",
+        "table/block_based/block_based_table_builder.cc",
+        "table/block_based/block_based_table_factory.cc",
+        "table/block_based/block_based_table_reader.cc",
+        "table/block_based/block_builder.cc",
+        "table/block_based/block_prefix_index.cc",
+        "table/block_based/data_block_hash_index.cc",
+        "table/block_based/data_block_footer.cc",
+        "table/block_based/flush_block_policy.cc",
+        "table/block_based/full_filter_block.cc",
+        "table/block_based/index_builder.cc",
+        "table/block_based/partitioned_filter_block.cc",
        "table/block_fetcher.cc",
-        "table/block_prefix_index.cc",
        "table/bloom_block.cc",
-        "table/cuckoo_table_builder.cc",
-        "table/cuckoo_table_factory.cc",
-        "table/cuckoo_table_reader.cc",
-        "table/data_block_footer.cc",
-        "table/data_block_hash_index.cc",
-        "table/flush_block_policy.cc",
+        "table/cuckoo/cuckoo_table_builder.cc",
+        "table/cuckoo/cuckoo_table_factory.cc",
+        "table/cuckoo/cuckoo_table_reader.cc",
        "table/format.cc",
-        "table/full_filter_block.cc",
        "table/get_context.cc",
-        "table/index_builder.cc",
        "table/iterator.cc",
        "table/merging_iterator.cc",
        "table/meta_blocks.cc",
-        "table/partitioned_filter_block.cc",
        "table/persistent_cache_helper.cc",
-        "table/plain_table_builder.cc",
-        "table/plain_table_factory.cc",
-        "table/plain_table_index.cc",
-        "table/plain_table_key_coding.cc",
-        "table/plain_table_reader.cc",
+        "table/plain/plain_table_builder.cc",
+        "table/plain/plain_table_factory.cc",
+        "table/plain/plain_table_index.cc",
+        "table/plain/plain_table_key_coding.cc",
+        "table/plain/plain_table_reader.cc",
        "table/sst_file_reader.cc",
        "table/sst_file_writer.cc",
        "table/table_properties.cc",
@ -378,12 +378,12 @@ ROCKS_TESTS = [
    ],
    [
        "block_based_filter_block_test",
-        "table/block_based_filter_block_test.cc",
+        "table/block_based/block_based_filter_block_test.cc",
        "serial",
    ],
    [
        "block_test",
-        "table/block_test.cc",
+        "table/block_based/block_test.cc",
        "serial",
    ],
    [
@ -488,7 +488,7 @@ ROCKS_TESTS = [
    ],
    [
        "cuckoo_table_builder_test",
-        "table/cuckoo_table_builder_test.cc",
+        "table/cuckoo/cuckoo_table_builder_test.cc",
        "serial",
    ],
    [
@ -498,12 +498,12 @@ ROCKS_TESTS = [
    ],
    [
        "cuckoo_table_reader_test",
-        "table/cuckoo_table_reader_test.cc",
+        "table/cuckoo/cuckoo_table_reader_test.cc",
        "serial",
    ],
    [
        "data_block_hash_index_test",
-        "table/data_block_hash_index_test.cc",
+        "table/block_based/data_block_hash_index_test.cc",
        "serial",
    ],
    [
@ -743,7 +743,7 @@ ROCKS_TESTS = [
    ],
    [
        "full_filter_block_test",
-        "table/full_filter_block_test.cc",
+        "table/block_based/full_filter_block_test.cc",
        "serial",
    ],
    [
@ -873,7 +873,7 @@ ROCKS_TESTS = [
    ],
    [
        "partitioned_filter_block_test",
-        "table/partitioned_filter_block_test.cc",
+        "table/block_based/partitioned_filter_block_test.cc",
        "serial",
    ],
    [
--- a/db/builder.cc
+++ b/db/builder.cc
@ -29,7 +29,7 @@
 #include "rocksdb/iterator.h"
 #include "rocksdb/options.h"
 #include "rocksdb/table.h"
-#include "table/block_based_table_builder.h"
+#include "table/block_based/block_based_table_builder.h"
 #include "table/format.h"
 #include "table/internal_iterator.h"
 #include "util/file_reader_writer.h"
--- a/db/column_family.cc
+++ b/db/column_family.cc
@ -33,7 +33,7 @@
 #include "memtable/hash_skiplist_rep.h"
 #include "monitoring/thread_status_util.h"
 #include "options/options_helper.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/merging_iterator.h"
 #include "util/autovector.h"
 #include "util/compression.h"
--- a/db/compaction_job.cc
+++ b/db/compaction_job.cc
@ -49,8 +49,8 @@
 #include "rocksdb/statistics.h"
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"
-#include "table/block.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/merging_iterator.h"
 #include "table/table_builder.h"
 #include "util/coding.h"
--- a/db/compaction_job_stats_test.cc
+++ b/db/compaction_job_stats_test.cc
@ -48,9 +48,9 @@
 #include "rocksdb/thread_status.h"
 #include "rocksdb/utilities/checkpoint.h"
 #include "rocksdb/utilities/write_batch_with_index.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/mock_table.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
 #include "util/hash.h"
--- a/db/corruption_test.cc
+++ b/db/corruption_test.cc
@ -25,8 +25,9 @@
 #include "rocksdb/env.h"
 #include "rocksdb/table.h"
 #include "rocksdb/write_batch.h"
-#include "table/block_based_table_builder.h"
+#include "table/block_based/block_based_table_builder.h"
 #include "table/meta_blocks.h"
+#include "file/filename.h"
 #include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
--- a/db/cuckoo_table_db_test.cc
+++ b/db/cuckoo_table_db_test.cc
@ -8,8 +8,8 @@
 #include "db/db_impl.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "table/cuckoo_table_factory.h"
-#include "table/cuckoo_table_reader.h"
+#include "table/cuckoo/cuckoo_table_factory.h"
+#include "table/cuckoo/cuckoo_table_reader.h"
 #include "table/meta_blocks.h"
 #include "util/string_util.h"
 #include "test_util/testharness.h"
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@ -77,8 +77,8 @@
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"
 #include "rocksdb/write_buffer_manager.h"
-#include "table/block.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/get_context.h"
 #include "table/merging_iterator.h"
 #include "table/multiget_context.h"
--- a/db/db_impl_open.cc
+++ b/db/db_impl_open.cc
@ -18,7 +18,7 @@
 #include "file/sst_file_manager_impl.h"
 #include "options/options_helper.h"
 #include "rocksdb/wal_filter.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "util/rate_limiter.h"
 #include "test_util/sync_point.h"

--- a/db/db_iterator_test.cc
+++ b/db/db_iterator_test.cc
@ -15,7 +15,7 @@
 #include "port/stack_trace.h"
 #include "rocksdb/iostats_context.h"
 #include "rocksdb/perf_context.h"
-#include "table/flush_block_policy.h"
+#include "table/block_based/flush_block_policy.h"

 namespace rocksdb {

--- a/db/db_test.cc
+++ b/db/db_test.cc
@ -54,9 +54,9 @@
 #include "rocksdb/utilities/checkpoint.h"
 #include "rocksdb/utilities/optimistic_transaction_db.h"
 #include "rocksdb/utilities/write_batch_with_index.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/mock_table.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
 #include "util/file_reader_writer.h"
--- a/db/db_test_util.h
+++ b/db/db_test_util.h
@ -8,6 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #pragma once
+
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
@ -41,9 +42,9 @@
 #include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
 #include "rocksdb/utilities/checkpoint.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/mock_table.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
 #include "test_util/mock_time_env.h"
--- a/db/flush_job.cc
+++ b/db/flush_job.cc
@ -40,8 +40,8 @@
 #include "rocksdb/statistics.h"
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"
-#include "table/block.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/merging_iterator.h"
 #include "table/table_builder.h"
 #include "table/two_level_iterator.h"
--- a/db/internal_stats.cc
+++ b/db/internal_stats.cc
@ -23,7 +23,7 @@

 #include "db/column_family.h"
 #include "db/db_impl.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "util/string_util.h"

 namespace rocksdb {
--- a/db/listener_test.cc
+++ b/db/listener_test.cc
@ -22,8 +22,9 @@
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
-#include "table/block_based_table_factory.h"
-#include "table/plain_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/plain/plain_table_factory.h"
+#include "file/filename.h"
 #include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
--- a/db/plain_table_db_test.cc
+++ b/db/plain_table_db_test.cc
@ -25,9 +25,9 @@
 #include "rocksdb/table.h"
 #include "table/bloom_block.h"
 #include "table/meta_blocks.h"
-#include "table/plain_table_factory.h"
-#include "table/plain_table_key_coding.h"
-#include "table/plain_table_reader.h"
+#include "table/plain/plain_table_factory.h"
+#include "table/plain/plain_table_key_coding.h"
+#include "table/plain/plain_table_reader.h"
 #include "table/table_builder.h"
 #include "util/hash.h"
 #include "util/logging.h"
--- a/db/table_properties_collector_test.cc
+++ b/db/table_properties_collector_test.cc
@ -12,11 +12,12 @@
 #include "db/db_impl.h"
 #include "db/dbformat.h"
 #include "db/table_properties_collector.h"
+
+#include "table/meta_blocks.h"
 #include "options/cf_options.h"
 #include "rocksdb/table.h"
-#include "table/block_based_table_factory.h"
-#include "table/meta_blocks.h"
-#include "table/plain_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/table_builder.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
--- a/db/version_set.cc
+++ b/db/version_set.cc
@ -45,7 +45,7 @@
 #include "table/merging_iterator.h"
 #include "table/meta_blocks.h"
 #include "table/multiget_context.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/table_reader.h"
 #include "table/two_level_iterator.h"
 #include "util/coding.h"
--- a/options/options.cc
+++ b/options/options.cc
@ -31,7 +31,7 @@
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
 #include "rocksdb/wal_filter.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "util/compression.h"

 namespace rocksdb {
--- a/options/options_helper.cc
+++ b/options/options_helper.cc
@ -9,6 +9,8 @@
 #include <cstdlib>
 #include <unordered_set>
 #include <vector>
+
+#include "table/plain/plain_table_factory.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/convenience.h"
@ -20,8 +22,7 @@
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/table.h"
 #include "rocksdb/utilities/object_registry.h"
-#include "table/block_based_table_factory.h"
-#include "table/plain_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "util/cast_util.h"
 #include "util/string_util.h"

--- a/options/options_parser.h
+++ b/options/options_parser.h
@ -12,7 +12,7 @@
 #include "options/options_sanity_check.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"

 namespace rocksdb {

--- a/src.mk
+++ b/src.mk
@ -97,36 +97,36 @@ LIB_SOURCES =                                                   \
  options/options_sanity_check.cc                               \
  port/port_posix.cc                                            \
  port/stack_trace.cc                                           \
-  table/adaptive_table_factory.cc                               \
-  table/block.cc                                                \
-  table/block_based_filter_block.cc                             \
-  table/block_based_table_builder.cc                            \
-  table/block_based_table_factory.cc                            \
-  table/block_based_table_reader.cc                             \
-  table/block_builder.cc                                        \
-  table/block_fetcher.cc                                        \
-  table/block_prefix_index.cc                                   \
-  table/bloom_block.cc                                          \
-  table/cuckoo_table_builder.cc                                 \
-  table/cuckoo_table_factory.cc                                 \
-  table/cuckoo_table_reader.cc                                  \
-  table/data_block_hash_index.cc                                \
-  table/data_block_footer.cc                                    \
-  table/flush_block_policy.cc                                   \
+  table/adaptive/adaptive_table_factory.cc                      \
+  table/block_based/block.cc                                     \
+  table/block_based/block_based_filter_block.cc                  \
+  table/block_based/block_based_table_builder.cc                 \
+  table/block_based/block_based_table_factory.cc                 \
+  table/block_based/block_based_table_reader.cc                  \
+  table/block_based/block_builder.cc                             \
+  table/block_based/block_prefix_index.cc                        \
+  table/block_based/data_block_hash_index.cc                     \
+  table/block_based/data_block_footer.cc                         \
+  table/block_based/flush_block_policy.cc                        \
+  table/block_based/full_filter_block.cc                         \
+  table/block_based/index_builder.cc                             \
+  table/block_based/partitioned_filter_block.cc                  \
+  table/block_fetcher.cc                             			\
+  table/bloom_block.cc                               			\
+  table/cuckoo/cuckoo_table_builder.cc                          \
+  table/cuckoo/cuckoo_table_factory.cc                          \
+  table/cuckoo/cuckoo_table_reader.cc                           \
  table/format.cc                                               \
-  table/full_filter_block.cc                                    \
  table/get_context.cc                                          \
-  table/index_builder.cc                                        \
  table/iterator.cc                                             \
  table/merging_iterator.cc                                     \
  table/meta_blocks.cc                                          \
-  table/partitioned_filter_block.cc                             \
  table/persistent_cache_helper.cc                              \
-  table/plain_table_builder.cc                                  \
-  table/plain_table_factory.cc                                  \
-  table/plain_table_index.cc                                    \
-  table/plain_table_key_coding.cc                               \
-  table/plain_table_reader.cc                                   \
+  table/plain/plain_table_builder.cc                            \
+  table/plain/plain_table_factory.cc                            \
+  table/plain/plain_table_index.cc                              \
+  table/plain/plain_table_key_coding.cc                         \
+  table/plain/plain_table_reader.cc                             \
  table/sst_file_reader.cc                                      \
  table/sst_file_writer.cc                                      \
  table/table_properties.cc                                     \
@ -319,7 +319,6 @@ MAIN_SOURCES =                                                          \
  db/obsolete_files_test.cc						\
  db/options_settable_test.cc                                           \
  db/options_file_test.cc                                               \
-  db/partitioned_filter_block_test.cc                                   \
  db/perf_context_test.cc                                               \
  db/persistent_cache_test.cc                                           \
  db/plain_table_db_test.cc                                             \
@ -348,13 +347,14 @@ MAIN_SOURCES =                                                          \
  monitoring/iostats_context_test.cc                                    \
  monitoring/statistics_test.cc                                         \
  options/options_test.cc                                               \
-  table/block_based_filter_block_test.cc                                \
-  table/block_test.cc                                                   \
+  table/block_based/block_based_filter_block_test.cc                     \
+  table/block_based/block_test.cc                                        \
+  table/block_based/data_block_hash_index_test.cc                        \
+  table/block_based/full_filter_block_test.cc                            \
+  table/block_based/partitioned_filter_block_test.cc                     \
  table/cleanable_test.cc                                               \
-  table/cuckoo_table_builder_test.cc                                    \
-  table/cuckoo_table_reader_test.cc                                     \
-  table/data_block_hash_index_test.cc                                   \
-  table/full_filter_block_test.cc                                       \
+  table/cuckoo/cuckoo_table_builder_test.cc                             \
+  table/cuckoo/cuckoo_table_reader_test.cc                              \
  table/merger_test.cc                                                  \
  table/sst_file_reader_test.cc                                         \
  table/table_reader_bench.cc                                           \
--- a/table/adaptive/adaptive_table_factory.cc
+++ b/table/adaptive/adaptive_table_factory.cc
@ -4,7 +4,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #ifndef ROCKSDB_LITE
-#include "table/adaptive_table_factory.h"
+#include "table/adaptive/adaptive_table_factory.h"

 #include "table/table_builder.h"
 #include "table/format.h"
--- a/table/adaptive/adaptive_table_factory.h
+++ b/table/adaptive/adaptive_table_factory.h
--- a/table/block_based/block.cc
+++ b/table/block_based/block.cc
@ -9,7 +9,7 @@
 //
 // Decodes the blocks generated by block_builder.cc.

-#include "table/block.h"
+#include "table/block_based/block.h"
 #include <algorithm>
 #include <string>
 #include <unordered_map>
@ -19,8 +19,8 @@
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/comparator.h"
-#include "table/block_prefix_index.h"
-#include "table/data_block_footer.h"
+#include "table/block_based/block_prefix_index.h"
+#include "table/block_based/data_block_footer.h"
 #include "table/format.h"
 #include "util/coding.h"
 #include "util/logging.h"
--- a/table/block_based/block.h
+++ b/table/block_based/block.h
@ -22,13 +22,13 @@

 #include "db/dbformat.h"
 #include "db/pinned_iterators_manager.h"
-#include "format.h"
+#include "table/format.h"
 #include "rocksdb/iterator.h"
 #include "rocksdb/options.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
-#include "table/block_prefix_index.h"
-#include "table/data_block_hash_index.h"
+#include "table/block_based/block_prefix_index.h"
+#include "table/block_based/data_block_hash_index.h"
 #include "table/internal_iterator.h"
 #include "util/random.h"
 #include "test_util/sync_point.h"
--- a/table/block_based/block_based_filter_block.cc
+++ b/table/block_based/block_based_filter_block.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 "table/block_based_filter_block.h"
+#include "table/block_based/block_based_filter_block.h"
 #include <algorithm>

 #include "db/dbformat.h"
--- a/table/block_based/block_based_filter_block.h
+++ b/table/block_based/block_based_filter_block.h
@ -18,10 +18,11 @@
 #include <memory>
 #include <string>
 #include <vector>
+
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-#include "table/filter_block.h"
+#include "table/block_based/filter_block.h"
 #include "util/hash.h"

 namespace rocksdb {
--- a/table/block_based/block_based_filter_block_test.cc
+++ b/table/block_based/block_based_filter_block_test.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 "table/block_based_filter_block.h"
+#include "table/block_based/block_based_filter_block.h"

 #include "rocksdb/filter_policy.h"
 #include "util/coding.h"
--- a/table/block_based/block_based_table_builder.cc
+++ b/table/block_based/block_based_table_builder.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 "table/block_based_table_builder.h"
+#include "table/block_based/block_based_table_builder.h"

 #include <assert.h>
 #include <stdio.h>
@ -20,6 +20,7 @@
 #include <utility>

 #include "db/dbformat.h"
+#include "index_builder.h"

 #include "rocksdb/cache.h"
 #include "rocksdb/comparator.h"
@ -29,14 +30,15 @@
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/table.h"

-#include "table/block.h"
-#include "table/block_based_filter_block.h"
-#include "table/block_based_table_factory.h"
-#include "table/block_based_table_reader.h"
-#include "table/block_builder.h"
-#include "table/filter_block.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/block_based_table_reader.h"
+#include "table/block_based/block_based_filter_block.h"
+#include "table/block_based/block_builder.h"
+#include "table/block_based/filter_block.h"
+#include "table/block_based/full_filter_block.h"
+#include "table/block_based/partitioned_filter_block.h"
 #include "table/format.h"
-#include "table/full_filter_block.h"
 #include "table/table_builder.h"

 #include "util/coding.h"
@ -47,8 +49,6 @@
 #include "util/string_util.h"
 #include "util/xxhash.h"

-#include "table/index_builder.h"
-#include "table/partitioned_filter_block.h"

 namespace rocksdb {

--- a/table/block_based/block_based_table_builder.h
+++ b/table/block_based/block_based_table_builder.h
@ -14,11 +14,11 @@
 #include <utility>
 #include <vector>

+#include "table/meta_blocks.h"
 #include "rocksdb/flush_block_policy.h"
 #include "rocksdb/listener.h"
 #include "rocksdb/options.h"
 #include "rocksdb/status.h"
-#include "table/meta_blocks.h"
 #include "table/table_builder.h"
 #include "util/compression.h"

--- a/table/block_based/block_based_table_factory.cc
+++ b/table/block_based/block_based_table_factory.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 "table/block_based_table_factory.h"

 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
@ -24,8 +23,9 @@
 #include "rocksdb/cache.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/flush_block_policy.h"
-#include "table/block_based_table_builder.h"
-#include "table/block_based_table_reader.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/block_based_table_builder.h"
+#include "table/block_based/block_based_table_reader.h"
 #include "table/format.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
--- a/table/block_based/block_based_table_factory.h
+++ b/table/block_based/block_based_table_factory.h
--- a/table/block_based/block_based_table_reader.cc
+++ b/table/block_based/block_based_table_reader.cc
@ -6,7 +6,7 @@
 // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 // 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 "table/block_based_table_reader.h"
+#include "table/block_based/block_based_table_reader.h"

 #include <algorithm>
 #include <array>
@ -15,6 +15,8 @@
 #include <utility>
 #include <vector>

+#include "table/block_fetcher.h"
+#include "table/meta_blocks.h"
 #include "db/dbformat.h"
 #include "db/pinned_iterators_manager.h"

@ -27,20 +29,17 @@
 #include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
-
-#include "table/block.h"
-#include "table/block_based_filter_block.h"
-#include "table/block_based_table_factory.h"
-#include "table/block_fetcher.h"
-#include "table/block_prefix_index.h"
-#include "table/filter_block.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_filter_block.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/block_prefix_index.h"
+#include "table/block_based/filter_block.h"
+#include "table/block_based/full_filter_block.h"
+#include "table/block_based/partitioned_filter_block.h"
 #include "table/format.h"
-#include "table/full_filter_block.h"
 #include "table/get_context.h"
 #include "table/internal_iterator.h"
-#include "table/meta_blocks.h"
 #include "table/multiget_context.h"
-#include "table/partitioned_filter_block.h"
 #include "table/persistent_cache_helper.h"
 #include "table/sst_file_writer_collectors.h"
 #include "table/two_level_iterator.h"
--- a/table/block_based/block_based_table_reader.h
+++ b/table/block_based/block_based_table_reader.h
@ -23,10 +23,10 @@
 #include "rocksdb/statistics.h"
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"
-#include "table/block.h"
-#include "table/block_based_table_factory.h"
-#include "table/cachable_entry.h"
-#include "table/filter_block.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/cachable_entry.h"
+#include "table/block_based/filter_block.h"
 #include "table/format.h"
 #include "table/get_context.h"
 #include "table/multiget_context.h"
--- a/table/block_based/block_builder.cc
+++ b/table/block_based/block_builder.cc
@ -31,13 +31,13 @@
 //     num_restarts: uint32
 // restarts[i] contains the offset within the block of the ith restart point.

-#include "table/block_builder.h"
+#include "table/block_based/block_builder.h"

 #include <assert.h>
 #include <algorithm>
 #include "db/dbformat.h"
 #include "rocksdb/comparator.h"
-#include "table/data_block_footer.h"
+#include "table/block_based/data_block_footer.h"
 #include "util/coding.h"

 namespace rocksdb {
--- a/table/block_based/block_builder.h
+++ b/table/block_based/block_builder.h
@ -13,7 +13,7 @@
 #include <stdint.h>
 #include "rocksdb/slice.h"
 #include "rocksdb/table.h"
-#include "table/data_block_hash_index.h"
+#include "table/block_based/data_block_hash_index.h"

 namespace rocksdb {

--- a/table/block_based/block_prefix_index.cc
+++ b/table/block_based/block_prefix_index.cc
@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "table/block_prefix_index.h"
+#include "table/block_based/block_prefix_index.h"

 #include <vector>

--- a/table/block_based/block_prefix_index.h
+++ b/table/block_based/block_prefix_index.h
--- a/table/block_based/block_test.cc
+++ b/table/block_based/block_test.cc
@ -3,6 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
+
 #include <stdio.h>
 #include <algorithm>
 #include <set>
@ -19,8 +20,8 @@
 #include "rocksdb/iterator.h"
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/table.h"
-#include "table/block.h"
-#include "table/block_builder.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_builder.h"
 #include "table/format.h"
 #include "util/random.h"
 #include "test_util/testharness.h"
--- a/table/block_based/cachable_entry.h
+++ b/table/block_based/cachable_entry.h
--- a/table/block_based/data_block_footer.cc
+++ b/table/block_based/data_block_footer.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 "data_block_footer.h"
+#include "table/block_based/data_block_footer.h"

 #include "rocksdb/table.h"

--- a/table/block_based/data_block_footer.h
+++ b/table/block_based/data_block_footer.h
--- a/table/block_based/data_block_hash_index.cc
+++ b/table/block_based/data_block_hash_index.cc
@ -6,7 +6,7 @@
 #include <vector>

 #include "rocksdb/slice.h"
-#include "table/data_block_hash_index.h"
+#include "table/block_based/data_block_hash_index.h"
 #include "util/coding.h"
 #include "util/hash.h"

--- a/table/block_based/data_block_hash_index.h
+++ b/table/block_based/data_block_hash_index.h
--- a/table/block_based/data_block_hash_index_test.cc
+++ b/table/block_based/data_block_hash_index_test.cc
@ -3,16 +3,17 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

+
 #include <cstdlib>
 #include <string>
 #include <unordered_map>

 #include "db/table_properties_collector.h"
 #include "rocksdb/slice.h"
-#include "table/block.h"
-#include "table/block_based_table_reader.h"
-#include "table/block_builder.h"
-#include "table/data_block_hash_index.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_reader.h"
+#include "table/block_based/block_builder.h"
+#include "table/block_based/data_block_hash_index.h"
 #include "table/get_context.h"
 #include "table/table_builder.h"
 #include "test_util/testharness.h"
--- a/table/block_based/filter_block.h
+++ b/table/block_based/filter_block.h
@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 #include "db/dbformat.h"
-#include "format.h"
+#include "table/format.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
--- a/table/block_based/flush_block_policy.cc
+++ b/table/block_based/flush_block_policy.cc
@ -6,7 +6,7 @@
 #include "rocksdb/flush_block_policy.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
-#include "table/block_builder.h"
+#include "table/block_based/block_builder.h"
 #include "table/format.h"

 #include <cassert>
--- a/table/block_based/flush_block_policy.h
+++ b/table/block_based/flush_block_policy.h
--- a/table/block_based/full_filter_block.cc
+++ b/table/block_based/full_filter_block.cc
@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "table/full_filter_block.h"
+#include "table/block_based/full_filter_block.h"

 #ifdef ROCKSDB_MALLOC_USABLE_SIZE
 #ifdef OS_FREEBSD
--- a/table/block_based/full_filter_block.h
+++ b/table/block_based/full_filter_block.h
@ -10,12 +10,13 @@
 #include <memory>
 #include <string>
 #include <vector>
+
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
 #include "db/dbformat.h"
 #include "util/hash.h"
-#include "table/filter_block.h"
+#include "table/block_based/filter_block.h"

 namespace rocksdb {

--- a/table/block_based/full_filter_block_test.cc
+++ b/table/block_based/full_filter_block_test.cc
@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "table/full_filter_block.h"
+#include "table/block_based/full_filter_block.h"

 #include "rocksdb/filter_policy.h"
 #include "table/full_filter_bits_builder.h"
--- a/table/block_based/index_builder.cc
+++ b/table/block_based/index_builder.cc
@ -7,7 +7,8 @@
 // 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 "table/index_builder.h"
+#include "table/block_based/index_builder.h"
+
 #include <assert.h>
 #include <inttypes.h>

@ -17,7 +18,7 @@
 #include "rocksdb/comparator.h"
 #include "rocksdb/flush_block_policy.h"
 #include "table/format.h"
-#include "table/partitioned_filter_block.h"
+#include "table/block_based/partitioned_filter_block.h"

 // Without anonymous namespace here, we fail the warning -Wmissing-prototypes
 namespace rocksdb {
--- a/table/block_based/index_builder.h
+++ b/table/block_based/index_builder.h
@ -17,8 +17,8 @@
 #include <unordered_map>

 #include "rocksdb/comparator.h"
-#include "table/block_based_table_factory.h"
-#include "table/block_builder.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/block_builder.h"
 #include "table/format.h"

 namespace rocksdb {
--- a/table/block_based/partitioned_filter_block.cc
+++ b/table/block_based/partitioned_filter_block.cc
@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "table/partitioned_filter_block.h"
+#include "table/block_based/partitioned_filter_block.h"

 #ifdef ROCKSDB_MALLOC_USABLE_SIZE
 #ifdef OS_FREEBSD
@ -17,8 +17,8 @@
 #include "monitoring/perf_context_imp.h"
 #include "port/port.h"
 #include "rocksdb/filter_policy.h"
-#include "table/block.h"
-#include "table/block_based_table_reader.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_reader.h"
 #include "util/coding.h"

 namespace rocksdb {
--- a/table/block_based/partitioned_filter_block.h
+++ b/table/block_based/partitioned_filter_block.h
@ -9,15 +9,14 @@
 #include <string>
 #include <unordered_map>
 #include "db/dbformat.h"
+#include "index_builder.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-
-#include "table/block.h"
-#include "table/block_based_table_reader.h"
-#include "table/cachable_entry.h"
-#include "table/full_filter_block.h"
-#include "table/index_builder.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_reader.h"
+#include "table/block_based/full_filter_block.h"
+#include "table/block_based/cachable_entry.h"
 #include "util/autovector.h"

 namespace rocksdb {
--- a/table/block_based/partitioned_filter_block_test.cc
+++ b/table/block_based/partitioned_filter_block_test.cc
@ -3,13 +3,15 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

+
 #include <map>

 #include "rocksdb/filter_policy.h"

 #include "table/full_filter_bits_builder.h"
-#include "table/index_builder.h"
-#include "table/partitioned_filter_block.h"
+#include "table/block_based/partitioned_filter_block.h"
+
+#include "index_builder.h"
 #include "util/coding.h"
 #include "util/hash.h"
 #include "util/logging.h"
@ -96,7 +98,7 @@ class PartitionedFilterBlockTest
               partition_size * table_options_.block_size_deviation / 100;
  }

-  int last_offset = 10;
+  uint64_t last_offset = 10;
  BlockHandle Write(const Slice& slice) {
    BlockHandle bh(last_offset + 1, slice.size());
    slices[bh.offset()] = slice;
--- a/table/block_fetcher.cc
+++ b/table/block_fetcher.cc
@ -15,8 +15,8 @@
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/env.h"
-#include "table/block.h"
-#include "table/block_based_table_reader.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_reader.h"
 #include "table/format.h"
 #include "table/persistent_cache_helper.h"
 #include "util/coding.h"
--- a/table/block_fetcher.h
+++ b/table/block_fetcher.h
@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #pragma once
-#include "table/block.h"
+#include "table/block_based/block.h"
 #include "table/format.h"
 #include "util/memory_allocator.h"

--- a/table/cuckoo/cuckoo_table_builder.cc
+++ b/table/cuckoo/cuckoo_table_builder.cc
@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #ifndef ROCKSDB_LITE
-#include "table/cuckoo_table_builder.h"
+#include "table/cuckoo/cuckoo_table_builder.h"

 #include <assert.h>
 #include <algorithm>
@ -15,8 +15,8 @@
 #include "db/dbformat.h"
 #include "rocksdb/env.h"
 #include "rocksdb/table.h"
-#include "table/block_builder.h"
-#include "table/cuckoo_table_factory.h"
+#include "table/block_based/block_builder.h"
+#include "table/cuckoo/cuckoo_table_factory.h"
 #include "table/format.h"
 #include "table/meta_blocks.h"
 #include "util/autovector.h"
--- a/table/cuckoo/cuckoo_table_builder.h
+++ b/table/cuckoo/cuckoo_table_builder.h
--- a/table/cuckoo/cuckoo_table_builder_test.cc
+++ b/table/cuckoo/cuckoo_table_builder_test.cc
@ -11,7 +11,7 @@
 #include <utility>

 #include "table/meta_blocks.h"
-#include "table/cuckoo_table_builder.h"
+#include "table/cuckoo/cuckoo_table_builder.h"
 #include "util/file_reader_writer.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
--- a/table/cuckoo/cuckoo_table_factory.cc
+++ b/table/cuckoo/cuckoo_table_factory.cc
@ -4,11 +4,11 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #ifndef ROCKSDB_LITE
-#include "table/cuckoo_table_factory.h"
+#include "table/cuckoo/cuckoo_table_factory.h"

 #include "db/dbformat.h"
-#include "table/cuckoo_table_builder.h"
-#include "table/cuckoo_table_reader.h"
+#include "table/cuckoo/cuckoo_table_builder.h"
+#include "table/cuckoo/cuckoo_table_reader.h"

 namespace rocksdb {

--- a/table/cuckoo/cuckoo_table_factory.h
+++ b/table/cuckoo/cuckoo_table_factory.h
--- a/table/cuckoo/cuckoo_table_reader.cc
+++ b/table/cuckoo/cuckoo_table_reader.cc
@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #ifndef ROCKSDB_LITE
-#include "table/cuckoo_table_reader.h"
+#include "table/cuckoo/cuckoo_table_reader.h"

 #include <algorithm>
 #include <limits>
@ -19,7 +19,7 @@
 #include "rocksdb/table.h"
 #include "table/internal_iterator.h"
 #include "table/meta_blocks.h"
-#include "table/cuckoo_table_factory.h"
+#include "table/cuckoo/cuckoo_table_factory.h"
 #include "table/get_context.h"
 #include "util/arena.h"
 #include "util/coding.h"
--- a/table/cuckoo/cuckoo_table_reader.h
+++ b/table/cuckoo/cuckoo_table_reader.h
--- a/table/cuckoo/cuckoo_table_reader_test.cc
+++ b/table/cuckoo/cuckoo_table_reader_test.cc
@ -22,9 +22,9 @@ int main() {
 #include <string>
 #include <map>

-#include "table/cuckoo_table_builder.h"
-#include "table/cuckoo_table_factory.h"
-#include "table/cuckoo_table_reader.h"
+#include "table/cuckoo/cuckoo_table_builder.h"
+#include "table/cuckoo/cuckoo_table_factory.h"
+#include "table/cuckoo/cuckoo_table_reader.h"
 #include "table/get_context.h"
 #include "table/meta_blocks.h"
 #include "util/arena.h"
--- a/table/format.cc
+++ b/table/format.cc
@ -12,12 +12,12 @@
 #include <inttypes.h>
 #include <string>

+#include "block_fetcher.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/env.h"
-#include "table/block.h"
-#include "table/block_based_table_reader.h"
-#include "table/block_fetcher.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_reader.h"
 #include "table/persistent_cache_helper.h"
 #include "util/coding.h"
 #include "util/compression.h"
--- a/table/get_context.h
+++ b/table/get_context.h
@ -11,7 +11,7 @@
 #include "rocksdb/env.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/types.h"
-#include "table/block.h"
+#include "table/block_based/block.h"

 namespace rocksdb {
 class MergeContext;
--- a/table/meta_blocks.cc
+++ b/table/meta_blocks.cc
@ -7,11 +7,11 @@
 #include <map>
 #include <string>

+#include "block_fetcher.h"
 #include "db/table_properties_collector.h"
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
-#include "table/block.h"
-#include "table/block_fetcher.h"
+#include "table/block_based/block.h"
 #include "table/format.h"
 #include "table/internal_iterator.h"
 #include "table/persistent_cache_helper.h"
--- a/table/meta_blocks.h
+++ b/table/meta_blocks.h
@ -15,7 +15,7 @@
 #include "rocksdb/memory_allocator.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
-#include "table/block_builder.h"
+#include "table/block_based/block_builder.h"
 #include "table/format.h"
 #include "util/kv_map.h"

--- a/table/persistent_cache_helper.cc
+++ b/table/persistent_cache_helper.cc
@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #include "table/persistent_cache_helper.h"
-#include "table/block_based_table_reader.h"
+#include "table/block_based/block_based_table_reader.h"
 #include "table/format.h"

 namespace rocksdb {
--- a/table/plain/plain_table_builder.cc
+++ b/table/plain/plain_table_builder.cc
@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #ifndef ROCKSDB_LITE
-#include "table/plain_table_builder.h"
+#include "table/plain/plain_table_builder.h"

 #include <assert.h>

@ -17,11 +17,11 @@
 #include "rocksdb/filter_policy.h"
 #include "rocksdb/options.h"
 #include "rocksdb/table.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "db/dbformat.h"
-#include "table/block_builder.h"
+#include "table/block_based/block_builder.h"
 #include "table/bloom_block.h"
-#include "table/plain_table_index.h"
+#include "table/plain/plain_table_index.h"
 #include "table/format.h"
 #include "table/meta_blocks.h"
 #include "util/coding.h"
--- a/table/plain/plain_table_builder.h
+++ b/table/plain/plain_table_builder.h
@ -4,6 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #pragma once
+
 #ifndef ROCKSDB_LITE
 #include <stdint.h>
 #include <string>
@ -13,8 +14,8 @@
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
 #include "table/bloom_block.h"
-#include "table/plain_table_index.h"
-#include "table/plain_table_key_coding.h"
+#include "table/plain/plain_table_index.h"
+#include "table/plain/plain_table_key_coding.h"
 #include "table/table_builder.h"

 namespace rocksdb {
--- a/table/plain/plain_table_factory.cc
+++ b/table/plain/plain_table_factory.cc
@ -4,7 +4,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #ifndef ROCKSDB_LITE
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"

 #include <stdint.h>
 #include <memory>
@ -12,8 +12,8 @@
 #include "options/options_helper.h"
 #include "port/port.h"
 #include "rocksdb/convenience.h"
-#include "table/plain_table_builder.h"
-#include "table/plain_table_reader.h"
+#include "table/plain/plain_table_builder.h"
+#include "table/plain/plain_table_reader.h"
 #include "util/string_util.h"

 namespace rocksdb {
--- a/table/plain/plain_table_factory.h
+++ b/table/plain/plain_table_factory.h
--- a/table/plain/plain_table_index.cc
+++ b/table/plain/plain_table_index.cc
@ -11,7 +11,7 @@

 #include <inttypes.h>

-#include "table/plain_table_index.h"
+#include "table/plain/plain_table_index.h"
 #include "util/coding.h"
 #include "util/hash.h"

--- a/table/plain/plain_table_index.h
+++ b/table/plain/plain_table_index.h
--- a/table/plain/plain_table_key_coding.cc
+++ b/table/plain/plain_table_key_coding.cc
@ -4,13 +4,13 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #ifndef ROCKSDB_LITE
-#include "table/plain_table_key_coding.h"
+#include "table/plain/plain_table_key_coding.h"

 #include <algorithm>
 #include <string>
 #include "db/dbformat.h"
-#include "table/plain_table_reader.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_reader.h"
+#include "table/plain/plain_table_factory.h"
 #include "util/file_reader_writer.h"

 namespace rocksdb {
--- a/table/plain/plain_table_key_coding.h
+++ b/table/plain/plain_table_key_coding.h
@ -4,12 +4,13 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #pragma once
+
 #ifndef ROCKSDB_LITE

 #include <array>
 #include "rocksdb/slice.h"
 #include "db/dbformat.h"
-#include "table/plain_table_reader.h"
+#include "table/plain/plain_table_reader.h"

 // The file contains three helper classes of PlainTable format,
 // PlainTableKeyEncoder, PlainTableKeyDecoder and PlainTableFileReader.
--- a/table/plain/plain_table_reader.cc
+++ b/table/plain/plain_table_reader.cc
@ -5,7 +5,7 @@

 #ifndef ROCKSDB_LITE

-#include "table/plain_table_reader.h"
+#include "table/plain/plain_table_reader.h"

 #include <string>
 #include <vector>
@ -19,15 +19,15 @@
 #include "rocksdb/options.h"
 #include "rocksdb/statistics.h"

-#include "table/block.h"
+#include "table/block_based/block.h"
 #include "table/bloom_block.h"
-#include "table/filter_block.h"
+#include "table/block_based/filter_block.h"
 #include "table/format.h"
 #include "table/internal_iterator.h"
 #include "table/meta_blocks.h"
 #include "table/two_level_iterator.h"
-#include "table/plain_table_factory.h"
-#include "table/plain_table_key_coding.h"
+#include "table/plain/plain_table_factory.h"
+#include "table/plain/plain_table_key_coding.h"
 #include "table/get_context.h"

 #include "monitoring/histogram.h"
--- a/table/plain/plain_table_reader.h
+++ b/table/plain/plain_table_reader.h
@ -19,8 +19,8 @@
 #include "rocksdb/table.h"
 #include "rocksdb/table_properties.h"
 #include "table/table_reader.h"
-#include "table/plain_table_factory.h"
-#include "table/plain_table_index.h"
+#include "table/plain/plain_table_factory.h"
+#include "table/plain/plain_table_index.h"
 #include "util/arena.h"
 #include "util/dynamic_bloom.h"
 #include "util/file_reader_writer.h"
--- a/table/sst_file_writer.cc
+++ b/table/sst_file_writer.cc
@ -6,9 +6,10 @@
 #include "rocksdb/sst_file_writer.h"

 #include <vector>
+
 #include "db/dbformat.h"
 #include "rocksdb/table.h"
-#include "table/block_based_table_builder.h"
+#include "table/block_based/block_based_table_builder.h"
 #include "table/sst_file_writer_collectors.h"
 #include "util/file_reader_writer.h"
 #include "test_util/sync_point.h"
--- a/table/table_properties.cc
+++ b/table/table_properties.cc
@ -4,10 +4,11 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #include "rocksdb/table_properties.h"
+
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
-#include "table/block.h"
+#include "table/block_based/block.h"
 #include "table/internal_iterator.h"
 #include "table/table_properties_internal.h"
 #include "util/string_util.h"
--- a/table/table_reader_bench.cc
+++ b/table/table_reader_bench.cc
@ -17,10 +17,10 @@ int main() {
 #include "rocksdb/db.h"
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/table.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/get_context.h"
 #include "table/internal_iterator.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/table_builder.h"
 #include "util/file_reader_writer.h"
 #include "util/gflags_compat.h"
--- a/table/table_test.cc
+++ b/table/table_test.cc
@ -16,11 +16,13 @@
 #include <string>
 #include <vector>

+#include "block_fetcher.h"
 #include "cache/lru_cache.h"
 #include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
 #include "memtable/stl_wrappers.h"
+#include "meta_blocks.h"
 #include "monitoring/statistics.h"
 #include "port/port.h"
 #include "rocksdb/cache.h"
@ -32,18 +34,16 @@
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/write_buffer_manager.h"
-#include "table/block.h"
-#include "table/block_based_table_builder.h"
-#include "table/block_based_table_factory.h"
-#include "table/block_based_table_reader.h"
-#include "table/block_builder.h"
-#include "table/block_fetcher.h"
-#include "table/flush_block_policy.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_builder.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/block_based_table_reader.h"
+#include "table/block_based/block_builder.h"
+#include "table/block_based/flush_block_policy.h"
 #include "table/format.h"
 #include "table/get_context.h"
 #include "table/internal_iterator.h"
-#include "table/meta_blocks.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "table/sst_file_writer_collectors.h"
 #include "util/compression.h"
--- a/table/two_level_iterator.cc
+++ b/table/two_level_iterator.cc
@ -11,7 +11,7 @@
 #include "db/pinned_iterators_manager.h"
 #include "rocksdb/options.h"
 #include "rocksdb/table.h"
-#include "table/block.h"
+#include "table/block_based/block.h"
 #include "table/format.h"
 #include "util/arena.h"

--- a/test_util/testutil.h
+++ b/test_util/testutil.h
@ -20,9 +20,9 @@
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/table.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/internal_iterator.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "util/mutexlock.h"
 #include "util/random.h"

--- a/tools/sst_dump_test.cc
+++ b/tools/sst_dump_test.cc
@ -13,7 +13,7 @@
 #include "rocksdb/sst_dump_tool.h"

 #include "rocksdb/filter_policy.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/table_builder.h"
 #include "util/file_reader_writer.h"
 #include "test_util/testharness.h"
--- a/tools/sst_dump_tool.cc
+++ b/tools/sst_dump_tool.cc
@ -1,3 +1,4 @@
+
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
 //  This source code is licensed under both the GPLv2 (found in the
 //  COPYING file in the root directory) and Apache 2.0 License
@ -28,13 +29,13 @@
 #include "rocksdb/status.h"
 #include "rocksdb/table_properties.h"
 #include "rocksdb/utilities/ldb_cmd.h"
-#include "table/block.h"
-#include "table/block_based_table_builder.h"
-#include "table/block_based_table_factory.h"
-#include "table/block_builder.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_builder.h"
+#include "table/block_based/block_based_table_factory.h"
+#include "table/block_based/block_builder.h"
 #include "table/format.h"
 #include "table/meta_blocks.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/table_reader.h"
 #include "util/compression.h"
 #include "util/random.h"
--- a/tools/trace_analyzer_tool.cc
+++ b/tools/trace_analyzer_tool.cc
@ -41,7 +41,7 @@
 #include "rocksdb/utilities/ldb_cmd.h"
 #include "rocksdb/write_batch.h"
 #include "table/meta_blocks.h"
-#include "table/plain_table_factory.h"
+#include "table/plain/plain_table_factory.h"
 #include "table/table_reader.h"
 #include "tools/trace_analyzer_tool.h"
 #include "util/coding.h"
--- a/util/bloom.cc
+++ b/util/bloom.cc
@ -10,9 +10,9 @@
 #include "rocksdb/filter_policy.h"

 #include "rocksdb/slice.h"
-#include "table/block_based_filter_block.h"
+#include "table/block_based/block_based_filter_block.h"
 #include "table/full_filter_bits_builder.h"
-#include "table/full_filter_block.h"
+#include "table/block_based/full_filter_block.h"
 #include "util/coding.h"
 #include "util/hash.h"

--- a/utilities/blob_db/blob_db_impl.cc
+++ b/utilities/blob_db/blob_db_impl.cc
@ -1,3 +1,4 @@
+
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
 //  This source code is licensed under both the GPLv2 (found in the
 //  COPYING file in the root directory) and Apache 2.0 License
@ -22,9 +23,9 @@
 #include "rocksdb/iterator.h"
 #include "rocksdb/utilities/stackable_db.h"
 #include "rocksdb/utilities/transaction.h"
-#include "table/block.h"
-#include "table/block_based_table_builder.h"
-#include "table/block_builder.h"
+#include "table/block_based/block.h"
+#include "table/block_based/block_based_table_builder.h"
+#include "table/block_based/block_builder.h"
 #include "table/meta_blocks.h"
 #include "util/cast_util.h"
 #include "util/crc32c.h"
--- a/utilities/memory/memory_test.cc
+++ b/utilities/memory/memory_test.cc
@ -10,7 +10,7 @@
 #include "rocksdb/table.h"
 #include "rocksdb/utilities/memory_util.h"
 #include "rocksdb/utilities/stackable_db.h"
-#include "table/block_based_table_factory.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "util/string_util.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
--- a/utilities/persistent_cache/persistent_cache_bench.cc
+++ b/utilities/persistent_cache/persistent_cache_bench.cc
@ -23,7 +23,7 @@ int main() { fprintf(stderr, "Please install gflags to run tools\n"); }

 #include "monitoring/histogram.h"
 #include "port/port.h"
-#include "table/block_builder.h"
+#include "table/block_based/block_builder.h"
 #include "util/gflags_compat.h"
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
--- a/utilities/persistent_cache/persistent_cache_test.h
+++ b/utilities/persistent_cache/persistent_cache_test.h
@ -20,7 +20,7 @@

 #include "db/db_test_util.h"
 #include "rocksdb/cache.h"
-#include "table/block_builder.h"
+#include "table/block_based/block_builder.h"
 #include "port/port.h"
 #include "util/arena.h"
 #include "test_util/testharness.h"