Move some file related files outside util/ (#5375)

Summary:
util/ means for lower level libraries, so it's a good idea to move the files which requires knowledge to DB out. Create a file/ and move some files there.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5375

Differential Revision: D15550935

Pulled By: siying

fbshipit-source-id: 61a9715dcde5386eebfb43e93f847bba1ae0d3f2

CMakeLists.txt

@@ -538,6 +538,10 @@ set(SOURCES
         env/env_encryption.cc
         env/env_hdfs.cc
         env/mock_env.cc
+        file/delete_scheduler.cc
+        file/file_util.cc
+        file/filename.cc
+        file/sst_file_manager_impl.cc
         memtable/alloc_tracker.cc
         memtable/hash_linklist_rep.cc
         memtable/hash_skiplist_rep.cc
@@ -612,12 +616,9 @@ set(SOURCES
         util/concurrent_arena.cc
         util/concurrent_task_limiter_impl.cc
         util/crc32c.cc
-        util/delete_scheduler.cc
         util/dynamic_bloom.cc
         util/event_logger.cc
         util/file_reader_writer.cc
-        util/file_util.cc
-        util/filename.cc
         util/filter_policy.cc
         util/hash.cc
         util/jemalloc_nodump_allocator.cc
@@ -626,7 +627,6 @@ set(SOURCES
         util/random.cc
         util/rate_limiter.cc
         util/slice.cc
-        util/sst_file_manager_impl.cc
         util/status.cc
         util/string_util.cc
         util/sync_point.cc
@@ -931,6 +931,7 @@ if(WITH_TESTS)
         env/env_basic_test.cc
         env/env_test.cc
         env/mock_env_test.cc
+        file/delete_scheduler_test.cc
         memtable/inlineskiplist_test.cc
         memtable/skiplist_test.cc
         memtable/write_buffer_manager_test.cc
@@ -959,7 +960,6 @@ if(WITH_TESTS)
         util/bloom_test.cc
         util/coding_test.cc
         util/crc32c_test.cc
-        util/delete_scheduler_test.cc
         util/dynamic_bloom_test.cc
         util/event_logger_test.cc
         util/file_reader_writer_test.cc

Makefile

@@ -1369,7 +1369,7 @@ fault_injection_test: db/fault_injection_test.o $(LIBOBJECTS) $(TESTHARNESS)
 rate_limiter_test: util/rate_limiter_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-delete_scheduler_test: util/delete_scheduler_test.o $(LIBOBJECTS) $(TESTHARNESS)
+delete_scheduler_test: file/delete_scheduler_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 filename_test: db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS)

TARGETS

@@ -143,6 +143,10 @@ cpp_library(
         "env/env_posix.cc",
         "env/io_posix.cc",
         "env/mock_env.cc",
+        "file/delete_scheduler.cc",
+        "file/file_util.cc",
+        "file/filename.cc",
+        "file/sst_file_manager_impl.cc",
         "memtable/alloc_tracker.cc",
         "memtable/hash_linklist_rep.cc",
         "memtable/hash_skiplist_rep.cc",
@@ -218,12 +222,9 @@ cpp_library(
         "util/concurrent_arena.cc",
         "util/concurrent_task_limiter_impl.cc",
         "util/crc32c.cc",
-        "util/delete_scheduler.cc",
         "util/dynamic_bloom.cc",
         "util/event_logger.cc",
         "util/file_reader_writer.cc",
-        "util/file_util.cc",
-        "util/filename.cc",
         "util/filter_policy.cc",
         "util/hash.cc",
         "util/jemalloc_nodump_allocator.cc",
@@ -232,7 +233,6 @@ cpp_library(
         "util/random.cc",
         "util/rate_limiter.cc",
         "util/slice.cc",
-        "util/sst_file_manager_impl.cc",
         "util/status.cc",
         "util/string_util.cc",
         "util/sync_point.cc",
@@ -663,7 +663,7 @@ ROCKS_TESTS = [
     ],
     [
         "delete_scheduler_test",
-        "util/delete_scheduler_test.cc",
+        "file/delete_scheduler_test.cc",
         "serial",
     ],
     [

db/builder.cc

@@ -21,6 +21,7 @@
 #include "db/range_del_aggregator.h"
 #include "db/table_cache.h"
 #include "db/version_edit.h"
+#include "file/filename.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/thread_status_util.h"
 #include "rocksdb/db.h"
@@ -32,7 +33,6 @@
 #include "table/format.h"
 #include "table/internal_iterator.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/stop_watch.h"
 #include "util/sync_point.h"
 

db/column_family.cc

@@ -29,6 +29,7 @@
 #include "db/table_properties_collector.h"
 #include "db/version_set.h"
 #include "db/write_controller.h"
+#include "file/sst_file_manager_impl.h"
 #include "memtable/hash_skiplist_rep.h"
 #include "monitoring/thread_status_util.h"
 #include "options/options_helper.h"
@@ -36,7 +37,6 @@
 #include "table/merging_iterator.h"
 #include "util/autovector.h"
 #include "util/compression.h"
-#include "util/sst_file_manager_impl.h"
 
 namespace rocksdb {
 

db/compaction_job.cc

@@ -38,6 +38,8 @@
 #include "db/merge_helper.h"
 #include "db/range_del_aggregator.h"
 #include "db/version_set.h"
+#include "file/filename.h"
+#include "file/sst_file_manager_impl.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_util.h"
@@ -53,12 +55,10 @@
 #include "table/table_builder.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"

db/compaction_job_stats_test.cc

@@ -27,6 +27,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
+#include "file/filename.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "monitoring/thread_status_util.h"
@@ -52,7 +53,6 @@
 #include "table/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
-#include "util/filename.h"
 #include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"

db/compaction_picker.cc

@@ -20,8 +20,8 @@
 #include <utility>
 #include <vector>
 #include "db/column_family.h"
+#include "file/filename.h"
 #include "monitoring/statistics.h"
-#include "util/filename.h"
 #include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"

db/compaction_picker_universal.cc

@@ -20,8 +20,8 @@
 #include <string>
 #include <utility>
 #include "db/column_family.h"
+#include "file/filename.h"
 #include "monitoring/statistics.h"
-#include "util/filename.h"
 #include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"

db/corruption_test.cc

@@ -19,6 +19,7 @@
 #include "db/db_impl.h"
 #include "db/log_format.h"
 #include "db/version_set.h"
+#include "file/filename.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/env.h"
@@ -26,7 +27,6 @@
 #include "rocksdb/write_batch.h"
 #include "table/block_based_table_builder.h"
 #include "table/meta_blocks.h"
-#include "util/filename.h"
 #include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"

db/db_filesnapshot.cc

@@ -17,11 +17,11 @@
 #include "db/db_impl.h"
 #include "db/job_context.h"
 #include "db/version_set.h"
+#include "file/file_util.h"
+#include "file/filename.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "util/file_util.h"
-#include "util/filename.h"
 #include "util/mutexlock.h"
 #include "util/sync_point.h"
 

db/db_impl.cc

@@ -53,6 +53,9 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "db/write_callback.h"
+#include "file/file_util.h"
+#include "file/filename.h"
+#include "file/sst_file_manager_impl.h"
 #include "memtable/hash_linklist_rep.h"
 #include "memtable/hash_skiplist_rep.h"
 #include "monitoring/iostats_context_imp.h"
@@ -89,12 +92,9 @@
 #include "util/compression.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/file_util.h"
-#include "util/filename.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"

db/db_impl_compaction_flush.cc

@@ -16,12 +16,12 @@
 #include "db/builder.h"
 #include "db/error_handler.h"
 #include "db/event_helpers.h"
+#include "file/sst_file_manager_impl.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_updater.h"
 #include "monitoring/thread_status_util.h"
 #include "util/concurrent_task_limiter_impl.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/sync_point.h"
 
 namespace rocksdb {

db/db_impl_files.cc

@@ -16,8 +16,8 @@
 #include <unordered_set>
 #include "db/event_helpers.h"
 #include "db/memtable_list.h"
-#include "util/file_util.h"
+#include "file/file_util.h"
-#include "util/sst_file_manager_impl.h"
+#include "file/sst_file_manager_impl.h"
 
 namespace rocksdb {
 

db/db_impl_open.cc

@@ -15,11 +15,11 @@
 
 #include "db/builder.h"
 #include "db/error_handler.h"
+#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 "util/rate_limiter.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/sync_point.h"
 
 namespace rocksdb {

db/db_info_dumper.cc

@@ -15,8 +15,8 @@
 #include <algorithm>
 #include <vector>
 
+#include "file/filename.h"
 #include "rocksdb/env.h"
-#include "util/filename.h"
 
 namespace rocksdb {
 

db/db_iter.cc

@@ -16,6 +16,7 @@
 #include "db/merge_context.h"
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
+#include "file/filename.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
@@ -24,7 +25,6 @@
 #include "table/internal_iterator.h"
 #include "table/iterator_wrapper.h"
 #include "util/arena.h"
-#include "util/filename.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"

db/db_sst_test.cc

@@ -8,10 +8,10 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "db/db_test_util.h"
+#include "file/sst_file_manager_impl.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/sst_file_manager.h"
-#include "util/sst_file_manager_impl.h"
 
 namespace rocksdb {
 

db/db_test.cc

@@ -31,6 +31,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
+#include "file/filename.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/thread_status_util.h"
 #include "port/port.h"
@@ -59,7 +60,6 @@
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/string_util.h"

db/db_test_util.h

@@ -27,6 +27,7 @@
 #include "db/db_impl.h"
 #include "db/dbformat.h"
 #include "env/mock_env.h"
+#include "file/filename.h"
 #include "memtable/hash_linklist_rep.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
@@ -45,7 +46,6 @@
 #include "table/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
-#include "util/filename.h"
 #include "util/mock_time_env.h"
 #include "util/mutexlock.h"
 

db/deletefile_test.cc

@@ -16,10 +16,10 @@
 #include "db/db_impl.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/transaction_log.h"
-#include "util/filename.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

db/error_handler.cc

@@ -6,7 +6,7 @@
 #include "db/error_handler.h"
 #include "db/db_impl.h"
 #include "db/event_helpers.h"
-#include "util/sst_file_manager_impl.h"
+#include "file/sst_file_manager_impl.h"
 
 namespace rocksdb {
 

db/external_sst_file_ingestion_job.cc

@@ -17,12 +17,12 @@
 #include <vector>
 
 #include "db/version_edit.h"
+#include "file/file_util.h"
 #include "table/merging_iterator.h"
 #include "table/scoped_arena_iterator.h"
 #include "table/sst_file_writer_collectors.h"
 #include "table/table_builder.h"
 #include "util/file_reader_writer.h"
-#include "util/file_util.h"
 #include "util/stop_watch.h"
 #include "util/sync_point.h"
 

db/external_sst_file_test.cc

@@ -7,11 +7,11 @@
 
 #include <functional>
 #include "db/db_test_util.h"
+#include "file/filename.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/sst_file_writer.h"
 #include "util/fault_injection_test_env.h"
-#include "util/filename.h"
 #include "util/testutil.h"
 
 namespace rocksdb {

db/fault_injection_test.cc

@@ -15,13 +15,13 @@
 #include "db/log_format.h"
 #include "db/version_set.h"
 #include "env/mock_env.h"
+#include "file/filename.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/table.h"
 #include "rocksdb/write_batch.h"
 #include "util/fault_injection_test_env.h"
-#include "util/filename.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/sync_point.h"

db/filename_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 "util/filename.h"
+#include "file/filename.h"
 
 #include "db/dbformat.h"
 #include "port/port.h"

db/flush_job.cc

@@ -29,6 +29,8 @@
 #include "db/merge_context.h"
 #include "db/range_tombstone_fragmenter.h"
 #include "db/version_set.h"
+#include "file/file_util.h"
+#include "file/filename.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_util.h"
@@ -45,8 +47,6 @@
 #include "table/two_level_iterator.h"
 #include "util/coding.h"
 #include "util/event_logger.h"
-#include "util/file_util.h"
-#include "util/filename.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"

db/listener_test.cc

@@ -8,6 +8,7 @@
 #include "db/dbformat.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/cache.h"
@@ -23,7 +24,6 @@
 #include "rocksdb/table_properties.h"
 #include "table/block_based_table_factory.h"
 #include "table/plain_table_factory.h"
-#include "util/filename.h"
 #include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"

db/memtable_list.h

@@ -16,13 +16,13 @@
 #include "db/logs_with_prep_tracker.h"
 #include "db/memtable.h"
 #include "db/range_del_aggregator.h"
+#include "file/filename.h"
 #include "monitoring/instrumented_mutex.h"
 #include "rocksdb/db.h"
 #include "rocksdb/iterator.h"
 #include "rocksdb/options.h"
 #include "rocksdb/types.h"
 #include "util/autovector.h"
-#include "util/filename.h"
 #include "util/log_buffer.h"
 
 namespace rocksdb {

db/obsolete_files_test.cc

@@ -16,10 +16,10 @@
 #include "db/db_impl.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/transaction_log.h"
-#include "util/filename.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

db/plain_table_db_test.cc

@@ -15,6 +15,7 @@
 #include "db/db_impl.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
@@ -28,7 +29,6 @@
 #include "table/plain_table_key_coding.h"
 #include "table/plain_table_reader.h"
 #include "table/table_builder.h"
-#include "util/filename.h"
 #include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"

db/repair.cc

@@ -74,6 +74,7 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "options/cf_options.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
@@ -82,7 +83,6 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/repair_test.cc

@@ -11,10 +11,10 @@
 
 #include "db/db_impl.h"
 #include "db/db_test_util.h"
+#include "file/file_util.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
 #include "rocksdb/transaction_log.h"
-#include "util/file_util.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/table_cache.cc

@@ -12,7 +12,7 @@
 #include "db/dbformat.h"
 #include "db/range_tombstone_fragmenter.h"
 #include "db/version_edit.h"
-#include "util/filename.h"
+#include "file/filename.h"
 
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/statistics.h"

db/transaction_log_impl.h

@@ -9,13 +9,13 @@
 
 #include "db/log_reader.h"
 #include "db/version_set.h"
+#include "file/filename.h"
 #include "options/db_options.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/transaction_log.h"
 #include "rocksdb/types.h"
-#include "util/filename.h"
 
 namespace rocksdb {
 

db/version_set.cc

@@ -33,6 +33,7 @@
 #include "db/pinned_iterators_manager.h"
 #include "db/table_cache.h"
 #include "db/version_builder.h"
+#include "file/filename.h"
 #include "monitoring/file_read_sample.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/env.h"
@@ -49,7 +50,6 @@
 #include "table/two_level_iterator.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"

db/wal_manager.cc

@@ -22,6 +22,8 @@
 #include "db/log_writer.h"
 #include "db/transaction_log_impl.h"
 #include "db/write_batch_internal.h"
+#include "file/file_util.h"
+#include "file/filename.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
@@ -29,8 +31,6 @@
 #include "util/cast_util.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/file_util.h"
-#include "util/filename.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"

file/delete_scheduler.cc

@@ -5,16 +5,16 @@
 
 #ifndef ROCKSDB_LITE
 
-#include "util/delete_scheduler.h"
+#include "file/delete_scheduler.h"
 
 #include <thread>
 #include <vector>
 
+#include "file/sst_file_manager_impl.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/sync_point.h"
 
 namespace rocksdb {

file/delete_scheduler_test.cc

@@ -12,10 +12,10 @@
 #include <thread>
 #include <vector>
 
+#include "file/delete_scheduler.h"
+#include "file/sst_file_manager_impl.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
-#include "util/delete_scheduler.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

file/file_util.cc

@@ -3,13 +3,13 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-#include "util/file_util.h"
+#include "file/file_util.h"
 
 #include <string>
 #include <algorithm>
 
+#include "file/sst_file_manager_impl.h"
 #include "rocksdb/env.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/file_reader_writer.h"
 
 namespace rocksdb {

file/file_util.h

@@ -6,11 +6,11 @@
 #pragma once
 #include <string>
 
+#include "file/filename.h"
 #include "options/db_options.h"
 #include "rocksdb/env.h"
 #include "rocksdb/status.h"
 #include "rocksdb/types.h"
-#include "util/filename.h"
 
 namespace rocksdb {
 // use_fsync maps to options.use_fsync, which determines the way that

file/filename.cc

@@ -10,7 +10,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include "util/filename.h"
+#include "file/filename.h"
 #include <inttypes.h>
 
 #include <ctype.h>

file/sst_file_manager_impl.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 "util/sst_file_manager_impl.h"
+#include "file/sst_file_manager_impl.h"
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS

file/sst_file_manager_impl.h

@@ -13,8 +13,8 @@
 
 #include "db/compaction.h"
 #include "db/error_handler.h"
+#include "file/delete_scheduler.h"
 #include "rocksdb/sst_file_manager.h"
-#include "util/delete_scheduler.h"
 
 namespace rocksdb {
 

src.mk

@@ -67,6 +67,10 @@ LIB_SOURCES =                                                   \
   env/env_posix.cc                                              \
   env/io_posix.cc                                               \
   env/mock_env.cc                                               \
+  file/delete_scheduler.cc                                      \
+  file/file_util.cc                                             \
+  file/filename.cc                                              \
+  file/sst_file_manager_impl.cc                                 \
   memtable/alloc_tracker.cc                                     \
   memtable/hash_linklist_rep.cc                                 \
   memtable/hash_skiplist_rep.cc                                 \
@@ -139,12 +143,9 @@ LIB_SOURCES =                                                   \
   util/concurrent_arena.cc                                      \
   util/concurrent_task_limiter_impl.cc                          \
   util/crc32c.cc                                                \
-  util/delete_scheduler.cc                                      \
   util/dynamic_bloom.cc                                         \
   util/event_logger.cc                                          \
   util/file_reader_writer.cc                                    \
-  util/file_util.cc                                             \
-  util/filename.cc                                              \
   util/filter_policy.cc                                         \
   util/hash.cc                                                  \
   util/jemalloc_nodump_allocator.cc                             \
@@ -153,7 +154,6 @@ LIB_SOURCES =                                                   \
   util/random.cc                                                \
   util/rate_limiter.cc                                          \
   util/slice.cc                                                 \
-  util/sst_file_manager_impl.cc                                 \
   util/status.cc                                                \
   util/string_util.cc                                           \
   util/sync_point.cc                                            \

tools/ldb_cmd.cc

@@ -16,6 +16,7 @@
 #include "db/dbformat.h"
 #include "db/log_reader.h"
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "port/port_dirent.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/table_properties.h"
@@ -31,7 +32,6 @@
 #include "tools/sst_dump_tool_imp.h"
 #include "util/cast_util.h"
 #include "util/coding.h"
-#include "util/filename.h"
 #include "util/stderr_logger.h"
 #include "util/string_util.h"
 #include "utilities/ttl/db_ttl_impl.h"

tools/write_stress.cc

@@ -67,12 +67,12 @@ int main() {
 #include <string>
 #include <thread>
 
+#include "file/filename.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
-#include "util/filename.h"
 #include "util/gflags_compat.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;

util/auto_roll_logger.h

@@ -10,9 +10,9 @@
 #include <list>
 #include <string>
 
+#include "file/filename.h"
 #include "port/port.h"
 #include "port/util_logger.h"
-#include "util/filename.h"
 #include "util/mutexlock.h"
 #include "util/sync_point.h"
 

util/fault_injection_test_env.h

@@ -19,9 +19,9 @@
 
 #include "db/version_set.h"
 #include "env/mock_env.h"
+#include "file/filename.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "util/filename.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
 

utilities/backupable/backupable_db.cc

@@ -10,6 +10,7 @@
 #ifndef ROCKSDB_LITE
 
 #include "rocksdb/utilities/backupable_db.h"
+#include "file/filename.h"
 #include "port/port.h"
 #include "rocksdb/rate_limiter.h"
 #include "rocksdb/transaction_log.h"
@@ -17,7 +18,6 @@
 #include "util/coding.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/logging.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"

utilities/backupable/backupable_db_test.cc

@@ -14,6 +14,7 @@
 
 #include "db/db_impl.h"
 #include "env/env_chroot.h"
+#include "file/filename.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/rate_limiter.h"
@@ -22,7 +23,6 @@
 #include "rocksdb/utilities/backupable_db.h"
 #include "rocksdb/utilities/options_util.h"
 #include "util/file_reader_writer.h"
-#include "util/filename.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
 #include "util/stderr_logger.h"

utilities/blob_db/blob_db_impl.cc

@@ -12,6 +12,9 @@
 
 #include "db/db_impl.h"
 #include "db/write_batch_internal.h"
+#include "file/file_util.h"
+#include "file/filename.h"
+#include "file/sst_file_manager_impl.h"
 #include "monitoring/instrumented_mutex.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/convenience.h"
@@ -26,12 +29,9 @@
 #include "util/cast_util.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/file_util.h"
-#include "util/filename.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/stop_watch.h"
 #include "util/sync_point.h"
 #include "util/timer_queue.h"

utilities/blob_db/blob_db_impl_filesnapshot.cc

@@ -7,7 +7,7 @@
 
 #include "utilities/blob_db/blob_db_impl.h"
 
-#include "util/filename.h"
+#include "file/filename.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 

utilities/blob_db/blob_db_test.cc

@@ -14,13 +14,13 @@
 #include <vector>
 
 #include "db/db_test_util.h"
+#include "file/file_util.h"
+#include "file/sst_file_manager_impl.h"
 #include "port/port.h"
 #include "rocksdb/utilities/debug.h"
 #include "util/cast_util.h"
 #include "util/fault_injection_test_env.h"
-#include "util/file_util.h"
 #include "util/random.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

utilities/blob_db/blob_file.cc

@@ -19,7 +19,7 @@
 #include "db/column_family.h"
 #include "db/db_impl.h"
 #include "db/dbformat.h"
-#include "util/filename.h"
+#include "file/filename.h"
 #include "util/logging.h"
 #include "utilities/blob_db/blob_db_impl.h"
 

utilities/checkpoint/checkpoint_impl.cc

@@ -21,13 +21,13 @@
 #include <vector>
 
 #include "db/wal_manager.h"
+#include "file/file_util.h"
+#include "file/filename.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/transaction_log.h"
 #include "rocksdb/utilities/checkpoint.h"
-#include "util/file_util.h"
-#include "util/filename.h"
 #include "util/sync_point.h"
 
 namespace rocksdb {

utilities/checkpoint/checkpoint_impl.h

@@ -9,8 +9,8 @@
 #include "rocksdb/utilities/checkpoint.h"
 
 #include <string>
+#include "file/filename.h"
 #include "rocksdb/db.h"
-#include "util/filename.h"
 
 namespace rocksdb {
 

utilities/convenience/info_log_finder.cc

@@ -8,8 +8,8 @@
 // found in the LICENSE file.
 
 #include "rocksdb/utilities/info_log_finder.h"
+#include "file/filename.h"
 #include "rocksdb/env.h"
-#include "util/filename.h"
 
 namespace rocksdb {
 

utilities/options/options_util.cc

@@ -7,9 +7,9 @@
 
 #include "rocksdb/utilities/options_util.h"
 
+#include "file/filename.h"
 #include "options/options_parser.h"
 #include "rocksdb/options.h"
-#include "util/filename.h"
 
 namespace rocksdb {
 Status LoadOptionsFromFile(const std::string& file_name, Env* env,

utilities/ttl/db_ttl_impl.cc

@@ -7,12 +7,12 @@
 #include "utilities/ttl/db_ttl_impl.h"
 
 #include "db/write_batch_internal.h"
+#include "file/filename.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
 #include "rocksdb/utilities/db_ttl.h"
 #include "util/coding.h"
-#include "util/filename.h"
 
 namespace rocksdb {