Move some files under util/ to separate dirs

Summary:
Move some files under util/ to new directories env/, monitoring/ options/ and cache/
Closes https://github.com/facebook/rocksdb/pull/2090

Differential Revision: D4833681

Pulled By: siying

fbshipit-source-id: 2fd8bef

CMakeLists.txt

@@ -281,6 +281,9 @@ add_subdirectory(third-party/gtest-1.7.0/fused-src/gtest)
 # Main library source code
 
 set(SOURCES
+        cache/clock_cache.cc
+        cache/lru_cache.cc
+        cache/sharded_cache.cc
         db/builder.cc
         db/c.cc
         db/column_family.cc
@@ -290,7 +293,6 @@ set(SOURCES
         db/compaction_job.cc
         db/compaction_picker.cc
         db/convenience.cc
-        db/dbformat.cc
         db/db_filesnapshot.cc
         db/db_impl.cc
         db/db_impl_write.cc
@@ -302,9 +304,10 @@ set(SOURCES
         db/db_impl_readonly.cc
         db/db_info_dumper.cc
         db/db_iter.cc
+        db/dbformat.cc
         db/event_helpers.cc
-        db/external_sst_file_ingestion_job.cc
         db/experimental.cc
+        db/external_sst_file_ingestion_job.cc
         db/file_indexer.cc
         db/flush_job.cc
         db/flush_scheduler.cc
@@ -332,11 +335,32 @@ set(SOURCES
         db/write_batch_base.cc
         db/write_controller.cc
         db/write_thread.cc
+        env/env.cc
+        env/env_chroot.cc
+        env/env_hdfs.cc
+        env/memenv.cc
         memtable/hash_cuckoo_rep.cc
         memtable/hash_linklist_rep.cc
         memtable/hash_skiplist_rep.cc
         memtable/skiplistrep.cc
         memtable/vectorrep.cc
+        monitoring/histogram.cc
+        monitoring/histogram_windowing.cc
+        monitoring/instrumented_mutex.cc
+        monitoring/iostats_context.cc
+        monitoring/perf_context.cc
+        monitoring/perf_level.cc
+        monitoring/statistics.cc
+        monitoring/thread_status_impl.cc
+        monitoring/thread_status_updater.cc
+        monitoring/thread_status_util.cc
+        monitoring/thread_status_util_debug.cc
+        options/cf_options.cc
+        options/db_options.cc
+        options/options.cc
+        options/options_helper.cc
+        options/options_parser.cc
+        options/options_sanity_check.cc
         port/stack_trace.cc
         table/adaptive_table_factory.cc
         table/block.cc
@@ -357,66 +381,45 @@ set(SOURCES
         table/index_builder.cc
         table/iterator.cc
         table/merging_iterator.cc
-        table/sst_file_writer.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/persistent_cache_helper.cc
+        table/sst_file_writer.cc
         table/table_properties.cc
         table/two_level_iterator.cc
-        tools/sst_dump_tool.cc
         tools/db_bench_tool.cc
         tools/dump/db_dump_tool.cc
+        tools/ldb_cmd.cc
+        tools/ldb_tool.cc
+        tools/sst_dump_tool.cc
         util/arena.cc
+        util/auto_roll_logger.cc
         util/bloom.cc
-        util/cf_options.cc
-        util/clock_cache.cc
         util/coding.cc
         util/compaction_job_stats_impl.cc
         util/comparator.cc
         util/concurrent_arena.cc
         util/crc32c.cc
-        util/db_options.cc
         util/delete_scheduler.cc
         util/dynamic_bloom.cc
-        util/env.cc
-        util/env_chroot.cc
-        util/env_hdfs.cc
         util/event_logger.cc
-        util/file_util.cc
         util/file_reader_writer.cc
+        util/file_util.cc
         util/filename.cc
-        util/sst_file_manager_impl.cc
         util/filter_policy.cc
         util/hash.cc
-        util/histogram.cc
-        util/histogram_windowing.cc
-        util/instrumented_mutex.cc
-        util/iostats_context.cc
-
-        util/lru_cache.cc
-        tools/ldb_cmd.cc
-        tools/ldb_tool.cc
-        util/auto_roll_logger.cc
-        util/logging.cc
         util/log_buffer.cc
-        util/memenv.cc
+        util/logging.cc
         util/murmurhash.cc
-        util/options.cc
-        util/options_helper.cc
-        util/options_parser.cc
-        util/options_sanity_check.cc
-        util/perf_context.cc
-        util/perf_level.cc
         util/random.cc
         util/rate_limiter.cc
-        util/sharded_cache.cc
         util/slice.cc
-        util/statistics.cc
+        util/sst_file_manager_impl.cc
         util/status.cc
         util/status_message.cc
         util/string_util.cc
@@ -424,15 +427,14 @@ set(SOURCES
         util/testutil.cc
         util/thread_local.cc
         util/threadpool_imp.cc
-        util/thread_status_impl.cc
-        util/thread_status_updater.cc
-        util/thread_status_util.cc
-        util/thread_status_util_debug.cc
         util/transaction_test_util.cc
         util/xxhash.cc
         utilities/backupable/backupable_db.cc
         utilities/blob_db/blob_db.cc
         utilities/checkpoint/checkpoint.cc
+        utilities/col_buf_decoder.cc
+        utilities/col_buf_encoder.cc
+        utilities/column_aware_encoding_util.cc
         utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
         utilities/date_tiered/date_tiered_db_impl.cc
         utilities/document/document_db.cc
@@ -444,10 +446,10 @@ set(SOURCES
         utilities/leveldb_options/leveldb_options.cc
         utilities/lua/rocks_lua_compaction_filter.cc
         utilities/memory/memory_util.cc
+        utilities/merge_operators/max.cc
+        utilities/merge_operators/put.cc
         utilities/merge_operators/string_append/stringappend.cc
         utilities/merge_operators/string_append/stringappend2.cc
-        utilities/merge_operators/put.cc
-        utilities/merge_operators/max.cc
         utilities/merge_operators/uint64add.cc
         utilities/option_change_migration/option_change_migration.cc
         utilities/options/options_util.cc
@@ -460,20 +462,17 @@ set(SOURCES
         utilities/simulator_cache/sim_cache.cc
         utilities/spatialdb/spatial_db.cc
         utilities/table_properties_collectors/compact_on_deletion_collector.cc
-        utilities/transactions/optimistic_transaction_impl.cc
         utilities/transactions/optimistic_transaction_db_impl.cc
+        utilities/transactions/optimistic_transaction_impl.cc
         utilities/transactions/transaction_base.cc
-        utilities/transactions/transaction_impl.cc
         utilities/transactions/transaction_db_impl.cc
         utilities/transactions/transaction_db_mutex_impl.cc
+        utilities/transactions/transaction_impl.cc
         utilities/transactions/transaction_lock_mgr.cc
         utilities/transactions/transaction_util.cc
         utilities/ttl/db_ttl_impl.cc
         utilities/write_batch_with_index/write_batch_with_index.cc
         utilities/write_batch_with_index/write_batch_with_index_internal.cc
-        utilities/col_buf_encoder.cc
-        utilities/col_buf_decoder.cc
-        utilities/column_aware_encoding_util.cc
         $<TARGET_OBJECTS:build_version>)
 
 if(WIN32)
@@ -488,8 +487,8 @@ if(WIN32)
 else()
   list(APPEND SOURCES
     port/port_posix.cc
-    util/env_posix.cc
+    env/env_posix.cc
-    util/io_posix.cc)
+    env/io_posix.cc)
 endif()
 
 if(WIN32)
@@ -549,42 +548,45 @@ else()
 endif()
 
 set(TESTS
+        cache/cache_test.cc
+        cache/lru_cache_test.cc
         db/column_family_test.cc
         db/compact_files_test.cc
         db/compaction_iterator_test.cc
-        db/compaction_job_test.cc
         db/compaction_job_stats_test.cc
+        db/compaction_job_test.cc
         db/compaction_picker_test.cc
         db/comparator_db_test.cc
         db/corruption_test.cc
         db/cuckoo_table_db_test.cc
         db/db_basic_test.cc
+        db/db_block_cache_test.cc
+        db/db_bloom_filter_test.cc
         db/db_compaction_filter_test.cc
         db/db_compaction_test.cc
         db/db_dynamic_level_test.cc
+        db/db_flush_test.cc
         db/db_inplace_update_test.cc
+        db/db_io_failure_test.cc
         db/db_iter_test.cc
+        db/db_iterator_test.cc
         db/db_log_iter_test.cc
         db/db_memtable_test.cc
         db/db_merge_operator_test.cc
         db/db_options_test.cc
         db/db_properties_test.cc
+        db/db_range_del_test.cc
+        db/db_sst_test.cc
         db/db_table_properties_test.cc
         db/db_tailing_iter_test.cc
         db/db_test.cc
         db/db_test2.cc
-        db/db_block_cache_test.cc
-        db/db_bloom_filter_test.cc
-        db/db_flush_test.cc
-        db/db_iterator_test.cc
-        db/db_range_del_test.cc
-        db/db_sst_test.cc
-        db/external_sst_file_basic_test.cc
-        db/external_sst_file_test.cc
         db/db_universal_compaction_test.cc
         db/db_wal_test.cc
         db/dbformat_test.cc
         db/deletefile_test.cc
+        db/external_sst_file_basic_test.cc
+        db/external_sst_file_test.cc
         db/fault_injection_test.cc
         db/file_indexer_test.cc
         db/filename_test.cc
@@ -594,8 +596,8 @@ set(TESTS
         db/log_test.cc
         db/manual_compaction_test.cc
         db/memtable_list_test.cc
-        db/merge_test.cc
         db/merge_helper_test.cc
+        db/merge_test.cc
         db/options_file_test.cc
         db/perf_context_test.cc
         db/plain_table_db_test.cc
@@ -610,7 +612,14 @@ set(TESTS
         db/write_batch_test.cc
         db/write_callback_test.cc
         db/write_controller_test.cc
-        db/db_io_failure_test.cc
+        env/env_basic_test.cc
+        env/env_test.cc
+        env/mock_env_test.cc
+        monitoring/histogram_test.cc
+        monitoring/iostats_context_test.cc
+        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/cuckoo_table_builder_test.cc
@@ -625,38 +634,30 @@ set(TESTS
         util/auto_roll_logger_test.cc
         util/autovector_test.cc
         util/bloom_test.cc
-        util/cache_test.cc
         util/coding_test.cc
         util/crc32c_test.cc
         util/delete_scheduler_test.cc
         util/dynamic_bloom_test.cc
-        util/env_basic_test.cc
-        util/env_test.cc
         util/event_logger_test.cc
-        util/filelock_test.cc
         util/file_reader_writer_test.cc
+        util/filelock_test.cc
         util/heap_test.cc
-        util/histogram_test.cc
-        util/iostats_context_test.cc
-        util/lru_cache_test.cc
-        util/mock_env_test.cc
-        util/options_settable_test.cc
-        util/options_test.cc
         util/rate_limiter_test.cc
         util/slice_transform_test.cc
-        util/statistics_test.cc
         util/thread_list_test.cc
         util/thread_local_test.cc
         utilities/backupable/backupable_db_test.cc
         utilities/blob_db/blob_db_test.cc
         utilities/checkpoint/checkpoint_test.cc
+        utilities/column_aware_encoding_test.cc
         utilities/date_tiered/date_tiered_test.cc
         utilities/document/document_db_test.cc
         utilities/document/json_document_test.cc
-        utilities/object_registry_test.cc
         utilities/geodb/geodb_test.cc
+        utilities/lua/rocks_lua_test.cc
         utilities/memory/memory_test.cc
         utilities/merge_operators/string_append/stringappend_test.cc
+        utilities/object_registry_test.cc
         utilities/option_change_migration/option_change_migration_test.cc
         utilities/options/options_util_test.cc
         utilities/persistent_cache/hash_table_test.cc
@@ -668,8 +669,6 @@ set(TESTS
         utilities/transactions/transaction_test.cc
         utilities/ttl/ttl_test.cc
         utilities/write_batch_with_index/write_batch_with_index_test.cc
-        utilities/column_aware_encoding_test.cc
-        utilities/lua/rocks_lua_test.cc
 )
 if(WITH_LIBRADOS)
   list(APPEND TESTS utilities/env_librados_test.cc)
@@ -678,7 +677,7 @@ endif()
 set(BENCHMARKS
   tools/db_bench.cc
   table/table_reader_bench.cc
-  util/cache_bench.cc
+  cache/cache_bench.cc
   db/memtablerep_bench.cc
   utilities/column_aware_encoding_exp.cc
   utilities/persistent_cache/hash_table_bench.cc)
@@ -694,10 +693,10 @@ endforeach(sourcefile ${BENCHMARKS})
 # and linked to tests. Add test only code that is not #ifdefed for Release here.
 set(TESTUTIL_SOURCE
     db/db_test_util.cc
+    env/mock_env.cc
+    monitoring/thread_status_updater_debug.cc
     table/mock_table.cc
-    util/mock_env.cc
     util/fault_injection_test_env.cc
-    util/thread_status_updater_debug.cc
 )
 # test utilities are only build in debug
 enable_testing()

Makefile

@@ -893,14 +893,14 @@ $(TOOLS_LIBRARY): $(BENCH_LIB_SOURCES:.cc=.o) $(TOOL_LIB_SOURCES:.cc=.o) $(LIB_S
 	$(AM_V_AR)rm -f $@
 	$(AM_V_at)$(AR) $(ARFLAGS) $@ $^
 
-librocksdb_env_basic_test.a: util/env_basic_test.o $(LIBOBJECTS) $(TESTHARNESS)
+librocksdb_env_basic_test.a: env/env_basic_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_V_AR)rm -f $@
 	$(AM_V_at)$(AR) $(ARFLAGS) $@ $^
 
 db_bench: tools/db_bench.o $(BENCHTOOLOBJECTS)
 	$(AM_LINK)
 
-cache_bench: util/cache_bench.o $(LIBOBJECTS) $(TESTUTIL)
+cache_bench: cache/cache_bench.o $(LIBOBJECTS) $(TESTUTIL)
 	$(AM_LINK)
 
 persistent_cache_bench: utilities/persistent_cache/persistent_cache_bench.o $(LIBOBJECTS) $(TESTUTIL)
@@ -942,7 +942,7 @@ dynamic_bloom_test: util/dynamic_bloom_test.o $(LIBOBJECTS) $(TESTHARNESS)
 c_test: db/c_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-cache_test: util/cache_test.o $(LIBOBJECTS) $(TESTHARNESS)
+cache_test: cache/cache_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 coding_test: util/coding_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -960,7 +960,7 @@ redis_test: utilities/redis/redis_lists_test.o $(LIBOBJECTS) $(TESTHARNESS)
 hash_table_test: utilities/persistent_cache/hash_table_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-histogram_test: util/histogram_test.o $(LIBOBJECTS) $(TESTHARNESS)
+histogram_test: monitoring/histogram_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 thread_local_test: util/thread_local_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1136,10 +1136,10 @@ wal_manager_test: db/wal_manager_test.o $(LIBOBJECTS) $(TESTHARNESS)
 dbformat_test: db/dbformat_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-env_basic_test: util/env_basic_test.o $(LIBOBJECTS) $(TESTHARNESS)
+env_basic_test: env/env_basic_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-env_test: util/env_test.o $(LIBOBJECTS) $(TESTHARNESS)
+env_test: env/env_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 fault_injection_test: db/fault_injection_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1256,10 +1256,10 @@ thread_list_test: util/thread_list_test.o $(LIBOBJECTS) $(TESTHARNESS)
 compact_files_test: db/compact_files_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-options_test: util/options_test.o $(LIBOBJECTS) $(TESTHARNESS)
+options_test: options/options_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-options_settable_test: util/options_settable_test.o $(LIBOBJECTS) $(TESTHARNESS)
+options_settable_test: options/options_settable_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 options_util_test: utilities/options/options_util_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1280,7 +1280,7 @@ column_aware_encoding_test: utilities/column_aware_encoding_test.o $(TESTHARNESS
 optimistic_transaction_test: utilities/transactions/optimistic_transaction_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-mock_env_test : util/mock_env_test.o $(LIBOBJECTS) $(TESTHARNESS)
+mock_env_test : env/mock_env_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 manual_compaction_test: db/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1319,16 +1319,16 @@ ldb_cmd_test: tools/ldb_cmd_test.o $(LIBOBJECTS) $(TESTHARNESS)
 ldb: tools/ldb.o $(LIBOBJECTS)
 	$(AM_LINK)
 
-iostats_context_test: util/iostats_context_test.o $(LIBOBJECTS) $(TESTHARNESS)
+iostats_context_test: monitoring/iostats_context_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_V_CCLD)$(CXX) $^ $(EXEC_LDFLAGS) -o $@ $(LDFLAGS)
 
 persistent_cache_test: utilities/persistent_cache/persistent_cache_test.o  db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-statistics_test: util/statistics_test.o $(LIBOBJECTS) $(TESTHARNESS)
+statistics_test: monitoring/statistics_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-lru_cache_test: util/lru_cache_test.o $(LIBOBJECTS) $(TESTHARNESS)
+lru_cache_test: cache/lru_cache_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 lua_test: utilities/lua/rocks_lua_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)

cache/cache_test.cc

@@ -14,9 +14,9 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "util/clock_cache.h"
+#include "cache/clock_cache.h"
+#include "cache/lru_cache.h"
 #include "util/coding.h"
-#include "util/lru_cache.h"
 #include "util/string_util.h"
 #include "util/testharness.h"
 

cache/clock_cache.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/clock_cache.h"
+#include "cache/clock_cache.h"
 
 #ifndef SUPPORT_CLOCK_CACHE
 
@@ -30,10 +30,10 @@ std::shared_ptr<Cache> NewClockCache(size_t capacity, int num_shard_bits,
 
 #include "tbb/concurrent_hash_map.h"
 
+#include "cache/sharded_cache.h"
 #include "port/port.h"
 #include "util/autovector.h"
 #include "util/mutexlock.h"
-#include "util/sharded_cache.h"
 
 namespace rocksdb {
 

cache/lru_cache.cc

@@ -11,7 +11,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include "util/lru_cache.h"
+#include "cache/lru_cache.h"
 
 #include <assert.h>
 #include <stdio.h>

cache/lru_cache.h

@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "util/sharded_cache.h"
+#include "cache/sharded_cache.h"
 
 #include "port/port.h"
 #include "util/autovector.h"

cache/lru_cache_test.cc

@@ -3,7 +3,7 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 
-#include "util/lru_cache.h"
+#include "cache/lru_cache.h"
 
 #include <string>
 #include <vector>

cache/sharded_cache.cc

@@ -11,7 +11,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include "util/sharded_cache.h"
+#include "cache/sharded_cache.h"
 
 #include <string>
 

db/builder.cc

@@ -20,6 +20,8 @@
 #include "db/merge_helper.h"
 #include "db/table_cache.h"
 #include "db/version_edit.h"
+#include "monitoring/iostats_context_imp.h"
+#include "monitoring/thread_status_util.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
@@ -29,9 +31,7 @@
 #include "table/internal_iterator.h"
 #include "util/file_reader_writer.h"
 #include "util/filename.h"
-#include "util/iostats_context_imp.h"
 #include "util/stop_watch.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 

db/builder.h

@@ -10,6 +10,7 @@
 #include <utility>
 #include <vector>
 #include "db/table_properties_collector.h"
+#include "options/cf_options.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"
 #include "rocksdb/listener.h"
@@ -18,7 +19,6 @@
 #include "rocksdb/table_properties.h"
 #include "rocksdb/types.h"
 #include "table/scoped_arena_iterator.h"
-#include "util/cf_options.h"
 #include "util/event_logger.h"
 
 namespace rocksdb {

db/column_family.cc

@@ -27,11 +27,11 @@
 #include "db/version_set.h"
 #include "db/write_controller.h"
 #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 "util/autovector.h"
 #include "util/compression.h"
-#include "util/options_helper.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 

db/column_family.h

@@ -19,11 +19,11 @@
 #include "db/table_properties_collector.h"
 #include "db/write_batch_internal.h"
 #include "db/write_controller.h"
+#include "options/cf_options.h"
 #include "rocksdb/compaction_job_stats.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
-#include "util/cf_options.h"
 #include "util/thread_local.h"
 
 namespace rocksdb {

db/column_family_test.cc

@@ -15,13 +15,13 @@
 
 #include "db/db_impl.h"
 #include "db/db_test_util.h"
+#include "options/options_parser.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
 #include "util/coding.h"
 #include "util/fault_injection_test_env.h"
-#include "util/options_parser.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

db/compaction.h

@@ -9,9 +9,9 @@
 
 #pragma once
 #include "db/version_set.h"
+#include "options/cf_options.h"
 #include "util/arena.h"
 #include "util/autovector.h"
-#include "util/cf_options.h"
 
 namespace rocksdb {
 

db/compaction_job.cc

@@ -35,6 +35,9 @@
 #include "db/merge_context.h"
 #include "db/merge_helper.h"
 #include "db/version_set.h"
+#include "monitoring/iostats_context_imp.h"
+#include "monitoring/perf_context_imp.h"
+#include "monitoring/thread_status_util.h"
 #include "port/likely.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
@@ -49,16 +52,13 @@
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
 #include "util/filename.h"
-#include "util/iostats_context_imp.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/perf_context_imp.h"
 #include "util/sst_file_manager_impl.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 

db/compaction_job.h

@@ -29,6 +29,7 @@
 #include "db/version_edit.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
+#include "options/db_options.h"
 #include "port/port.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/compaction_job_stats.h"
@@ -38,7 +39,6 @@
 #include "rocksdb/transaction_log.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/autovector.h"
-#include "util/db_options.h"
 #include "util/event_logger.h"
 #include "util/stop_watch.h"
 #include "util/thread_local.h"

db/compaction_job_stats_test.cc

@@ -26,7 +26,10 @@
 #include "db/job_context.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "env/mock_env.h"
 #include "memtable/hash_linklist_rep.h"
+#include "monitoring/statistics.h"
+#include "monitoring/thread_status_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
@@ -52,15 +55,12 @@
 #include "util/filename.h"
 #include "util/hash.h"
 #include "util/logging.h"
-#include "util/mock_env.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
-#include "util/statistics.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
-#include "util/thread_status_util.h"
 #include "utilities/merge_operators.h"
 
 #if !defined(IOS_CROSS_COMPILE)

db/compaction_picker.cc

@@ -19,10 +19,10 @@
 #include <string>
 #include <utility>
 #include "db/column_family.h"
+#include "monitoring/statistics.h"
 #include "util/filename.h"
 #include "util/log_buffer.h"
 #include "util/random.h"
-#include "util/statistics.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 

db/compaction_picker.h

@@ -17,10 +17,10 @@
 
 #include "db/compaction.h"
 #include "db/version_set.h"
+#include "options/cf_options.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/status.h"
-#include "util/cf_options.h"
 
 namespace rocksdb {
 

db/db_block_cache_test.cc

@@ -7,9 +7,9 @@
 // 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 <cstdlib>
+#include "cache/lru_cache.h"
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
-#include "util/lru_cache.h"
 
 namespace rocksdb {
 

db/db_impl.cc

@@ -58,6 +58,13 @@
 #include "db/write_callback.h"
 #include "memtable/hash_linklist_rep.h"
 #include "memtable/hash_skiplist_rep.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 "options/cf_options.h"
+#include "options/options_helper.h"
+#include "options/options_parser.h"
 #include "port/likely.h"
 #include "port/port.h"
 #include "rocksdb/cache.h"
@@ -78,26 +85,19 @@
 #include "util/auto_roll_logger.h"
 #include "util/autovector.h"
 #include "util/build_version.h"
-#include "util/cf_options.h"
 #include "util/coding.h"
 #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/iostats_context_imp.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/options_helper.h"
-#include "util/options_parser.h"
-#include "util/perf_context_imp.h"
 #include "util/sst_file_manager_impl.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
-#include "util/thread_status_updater.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 const std::string kDefaultColumnFamilyName("default");

db/db_impl.h

@@ -34,6 +34,8 @@
 #include "db/write_controller.h"
 #include "db/write_thread.h"
 #include "memtable_list.h"
+#include "monitoring/instrumented_mutex.h"
+#include "options/db_options.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
@@ -43,10 +45,8 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/autovector.h"
-#include "util/db_options.h"
 #include "util/event_logger.h"
 #include "util/hash.h"
-#include "util/instrumented_mutex.h"
 #include "util/stop_watch.h"
 #include "util/thread_local.h"
 

db/db_impl_compaction_flush.cc

@@ -14,12 +14,12 @@
 #include <inttypes.h>
 
 #include "db/builder.h"
-#include "util/iostats_context_imp.h"
+#include "monitoring/iostats_context_imp.h"
-#include "util/perf_context_imp.h"
+#include "monitoring/perf_context_imp.h"
 #include "util/sst_file_manager_impl.h"
 #include "util/sync_point.h"
-#include "util/thread_status_updater.h"
+#include "monitoring/thread_status_updater.h"
-#include "util/thread_status_util.h"
+#include "monitoring/thread_status_util.h"
 
 namespace rocksdb {
 Status DBImpl::SyncClosedLogs(JobContext* job_context) {

db/db_impl_debug.cc

@@ -10,7 +10,7 @@
 #ifndef NDEBUG
 
 #include "db/db_impl.h"
-#include "util/thread_status_updater.h"
+#include "monitoring/thread_status_updater.h"
 
 namespace rocksdb {
 

db/db_impl_open.cc

@@ -15,7 +15,7 @@
 
 #include "db/builder.h"
 #include "rocksdb/wal_filter.h"
-#include "util/options_helper.h"
+#include "options/options_helper.h"
 #include "util/sst_file_manager_impl.h"
 #include "util/sync_point.h"
 

db/db_impl_readonly.cc

@@ -11,7 +11,7 @@
 #include "db/db_iter.h"
 #include "db/merge_context.h"
 #include "db/range_del_aggregator.h"
-#include "util/perf_context_imp.h"
+#include "monitoring/perf_context_imp.h"
 
 namespace rocksdb {
 

db/db_impl_write.cc

@@ -12,8 +12,8 @@
 #define __STDC_FORMAT_MACROS
 #endif
 #include <inttypes.h>
-#include "util/options_helper.h"
+#include "options/options_helper.h"
-#include "util/perf_context_imp.h"
+#include "monitoring/perf_context_imp.h"
 #include "util/sync_point.h"
 
 namespace rocksdb {

db/db_info_dumper.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "util/db_options.h"
+#include "options/db_options.h"
 
 namespace rocksdb {
 void DumpDBFileSummary(const ImmutableDBOptions& options,

db/db_iter.cc

@@ -17,6 +17,7 @@
 #include "db/merge_context.h"
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
+#include "monitoring/perf_context_imp.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
@@ -27,7 +28,6 @@
 #include "util/filename.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/perf_context_imp.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/db_iter.h

@@ -12,11 +12,11 @@
 #include <string>
 #include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
+#include "options/cf_options.h"
 #include "rocksdb/db.h"
 #include "rocksdb/iterator.h"
 #include "util/arena.h"
 #include "util/autovector.h"
-#include "util/cf_options.h"
 
 namespace rocksdb {
 

db/db_options_test.cc

@@ -13,9 +13,9 @@
 #include "db/column_family.h"
 #include "db/db_impl.h"
 #include "db/db_test_util.h"
+#include "options/options_helper.h"
 #include "port/stack_trace.h"
 #include "rocksdb/convenience.h"
-#include "util/options_helper.h"
 #include "util/random.h"
 #include "util/sync_point.h"
 #include "util/testutil.h"

db/db_test.cc

@@ -29,7 +29,9 @@
 #include "db/job_context.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
+#include "env/mock_env.h"
 #include "memtable/hash_linklist_rep.h"
+#include "monitoring/thread_status_util.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/cache.h"
@@ -59,14 +61,12 @@
 #include "util/filename.h"
 #include "util/hash.h"
 #include "util/logging.h"
-#include "util/mock_env.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
-#include "util/thread_status_util.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

db/db_test_util.h

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

db/db_wal_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 "options/options_helper.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "util/fault_injection_test_env.h"
-#include "util/options_helper.h"
 #include "util/sync_point.h"
 
 namespace rocksdb {

db/dbformat.cc

@@ -14,9 +14,9 @@
 
 #include <inttypes.h>
 #include <stdio.h>
+#include "monitoring/perf_context_imp.h"
 #include "port/port.h"
 #include "util/coding.h"
-#include "util/perf_context_imp.h"
 
 namespace rocksdb {
 

db/external_sst_file_ingestion_job.h

@@ -12,11 +12,11 @@
 #include "db/dbformat.h"
 #include "db/internal_stats.h"
 #include "db/snapshot_impl.h"
+#include "options/db_options.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/sst_file_writer.h"
 #include "util/autovector.h"
-#include "util/db_options.h"
 
 namespace rocksdb {
 

db/fault_injection_test.cc

@@ -14,6 +14,7 @@
 #include "db/db_impl.h"
 #include "db/log_format.h"
 #include "db/version_set.h"
+#include "env/mock_env.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
@@ -22,7 +23,6 @@
 #include "util/fault_injection_test_env.h"
 #include "util/filename.h"
 #include "util/logging.h"
-#include "util/mock_env.h"
 #include "util/mutexlock.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

db/flush_job.cc

@@ -28,6 +28,9 @@
 #include "db/memtable_list.h"
 #include "db/merge_context.h"
 #include "db/version_set.h"
+#include "monitoring/iostats_context_imp.h"
+#include "monitoring/perf_context_imp.h"
+#include "monitoring/thread_status_util.h"
 #include "port/likely.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
@@ -44,14 +47,11 @@
 #include "util/event_logger.h"
 #include "util/file_util.h"
 #include "util/filename.h"
-#include "util/iostats_context_imp.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/perf_context_imp.h"
 #include "util/stop_watch.h"
 #include "util/sync_point.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 

db/flush_job.h

@@ -27,6 +27,8 @@
 #include "db/version_edit.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
+#include "monitoring/instrumented_mutex.h"
+#include "options/db_options.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
@@ -34,9 +36,7 @@
 #include "rocksdb/transaction_log.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/autovector.h"
-#include "util/db_options.h"
 #include "util/event_logger.h"
-#include "util/instrumented_mutex.h"
 #include "util/stop_watch.h"
 #include "util/thread_local.h"
 

db/listener_test.cc

@@ -9,6 +9,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "memtable/hash_linklist_rep.h"
+#include "monitoring/statistics.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
@@ -27,7 +28,6 @@
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
-#include "util/statistics.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

db/memtable.cc

@@ -17,6 +17,8 @@
 #include "db/merge_context.h"
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
+#include "monitoring/perf_context_imp.h"
+#include "monitoring/statistics.h"
 #include "port/port.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"
@@ -33,8 +35,6 @@
 #include "util/memory_usage.h"
 #include "util/murmurhash.h"
 #include "util/mutexlock.h"
-#include "util/perf_context_imp.h"
-#include "util/statistics.h"
 #include "util/stop_watch.h"
 
 namespace rocksdb {

db/memtable.h

@@ -20,14 +20,14 @@
 #include "db/range_del_aggregator.h"
 #include "db/skiplist.h"
 #include "db/version_edit.h"
+#include "monitoring/instrumented_mutex.h"
+#include "options/cf_options.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/memtablerep.h"
-#include "util/cf_options.h"
 #include "util/concurrent_arena.h"
 #include "util/dynamic_bloom.h"
 #include "util/hash.h"
-#include "util/instrumented_mutex.h"
 
 namespace rocksdb {
 

db/memtable_list.cc

@@ -13,6 +13,7 @@
 #include <string>
 #include "db/memtable.h"
 #include "db/version_set.h"
+#include "monitoring/thread_status_util.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
@@ -20,7 +21,6 @@
 #include "util/coding.h"
 #include "util/log_buffer.h"
 #include "util/sync_point.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 

db/memtable_list.h

@@ -15,13 +15,13 @@
 #include "db/memtable.h"
 #include "db/range_del_aggregator.h"
 #include "db/skiplist.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/instrumented_mutex.h"
 #include "util/log_buffer.h"
 
 namespace rocksdb {

db/merge_helper.cc

@@ -9,12 +9,12 @@
 #include <string>
 
 #include "db/dbformat.h"
+#include "monitoring/perf_context_imp.h"
+#include "monitoring/statistics.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
 #include "rocksdb/merge_operator.h"
 #include "table/internal_iterator.h"
-#include "util/perf_context_imp.h"
-#include "util/statistics.h"
 
 namespace rocksdb {
 

db/perf_context_test.cc

@@ -8,17 +8,17 @@
 #include <thread>
 #include <vector>
 
+#include "monitoring/histogram.h"
+#include "monitoring/instrumented_mutex.h"
+#include "monitoring/thread_status_util.h"
+#include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/memtablerep.h"
 #include "rocksdb/perf_context.h"
 #include "rocksdb/slice_transform.h"
-#include "port/port.h"
-#include "util/histogram.h"
-#include "util/instrumented_mutex.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/testharness.h"
-#include "util/thread_status_util.h"
 #include "utilities/merge_operators.h"
 
 bool FLAGS_random_key = false;

db/prefix_test.cc

@@ -19,6 +19,7 @@ int main() {
 
 #include <gflags/gflags.h>
 #include "db/db_impl.h"
+#include "monitoring/histogram.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
 #include "rocksdb/filter_policy.h"
@@ -26,7 +27,6 @@ int main() {
 #include "rocksdb/perf_context.h"
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/table.h"
-#include "util/histogram.h"
 #include "util/random.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"

db/repair.cc

@@ -74,13 +74,13 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
+#include "options/cf_options.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/write_buffer_manager.h"
 #include "table/scoped_arena_iterator.h"
-#include "util/cf_options.h"
 #include "util/file_reader_writer.h"
 #include "util/filename.h"
 #include "util/string_util.h"

db/table_cache.cc

@@ -13,15 +13,15 @@
 #include "db/version_edit.h"
 #include "util/filename.h"
 
+#include "monitoring/perf_context_imp.h"
 #include "rocksdb/statistics.h"
+#include "table/get_context.h"
 #include "table/internal_iterator.h"
 #include "table/iterator_wrapper.h"
 #include "table/table_builder.h"
 #include "table/table_reader.h"
-#include "table/get_context.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/perf_context_imp.h"
 #include "util/stop_watch.h"
 #include "util/sync_point.h"
 

db/table_cache.h

@@ -16,13 +16,13 @@
 
 #include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
+#include "options/cf_options.h"
 #include "port/port.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/table.h"
 #include "table/table_reader.h"
-#include "util/cf_options.h"
 
 namespace rocksdb {
 

db/table_properties_collector_test.cc

@@ -12,12 +12,12 @@
 #include "db/db_impl.h"
 #include "db/dbformat.h"
 #include "db/table_properties_collector.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/table_builder.h"
-#include "util/cf_options.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
 #include "util/testharness.h"

db/transaction_log_impl.h

@@ -9,12 +9,12 @@
 
 #include "db/log_reader.h"
 #include "db/version_set.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/db_options.h"
 #include "util/filename.h"
 
 namespace rocksdb {

db/version_set.cc

@@ -32,6 +32,7 @@
 #include "db/pinned_iterators_manager.h"
 #include "db/table_cache.h"
 #include "db/version_builder.h"
+#include "monitoring/perf_context_imp.h"
 #include "rocksdb/env.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/write_buffer_manager.h"
@@ -47,7 +48,6 @@
 #include "util/file_reader_writer.h"
 #include "util/filename.h"
 #include "util/logging.h"
-#include "util/perf_context_imp.h"
 #include "util/stop_watch.h"
 #include "util/sync_point.h"
 

db/version_set.h

@@ -39,10 +39,10 @@
 #include "db/version_builder.h"
 #include "db/version_edit.h"
 #include "db/write_controller.h"
+#include "monitoring/instrumented_mutex.h"
+#include "options/db_options.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
-#include "util/db_options.h"
-#include "util/instrumented_mutex.h"
 
 namespace rocksdb {
 

db/wal_manager.h

@@ -18,12 +18,12 @@
 #include <memory>
 
 #include "db/version_set.h"
+#include "options/db_options.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/status.h"
 #include "rocksdb/transaction_log.h"
 #include "rocksdb/types.h"
-#include "util/db_options.h"
 
 namespace rocksdb {
 

db/wal_manager_test.cc

@@ -12,17 +12,17 @@
 #include "rocksdb/write_batch.h"
 #include "rocksdb/write_buffer_manager.h"
 
-#include "db/wal_manager.h"
-#include "db/log_writer.h"
 #include "db/column_family.h"
+#include "db/db_impl.h"
+#include "db/log_writer.h"
 #include "db/version_set.h"
+#include "db/wal_manager.h"
+#include "env/mock_env.h"
+#include "table/mock_table.h"
 #include "util/file_reader_writer.h"
-#include "util/mock_env.h"
 #include "util/string_util.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
-#include "table/mock_table.h"
-#include "db/db_impl.h"
 
 namespace rocksdb {
 

db/write_batch.cc

@@ -45,10 +45,10 @@
 #include "db/merge_context.h"
 #include "db/snapshot_impl.h"
 #include "db/write_batch_internal.h"
+#include "monitoring/perf_context_imp.h"
+#include "monitoring/statistics.h"
 #include "rocksdb/merge_operator.h"
 #include "util/coding.h"
-#include "util/perf_context_imp.h"
-#include "util/statistics.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/write_thread.h

@@ -15,12 +15,12 @@
 #include <vector>
 
 #include "db/write_callback.h"
+#include "monitoring/instrumented_mutex.h"
 #include "rocksdb/options.h"
 #include "rocksdb/status.h"
 #include "rocksdb/types.h"
 #include "rocksdb/write_batch.h"
 #include "util/autovector.h"
-#include "util/instrumented_mutex.h"
 
 namespace rocksdb {
 

env/env_basic_test.cc

@@ -7,9 +7,9 @@
 #include <vector>
 #include <algorithm>
 
+#include "env/mock_env.h"
 #include "rocksdb/env.h"
 #include "rocksdb/utilities/object_registry.h"
-#include "util/mock_env.h"
 #include "util/testharness.h"
 
 namespace rocksdb {

env/env_chroot.cc

@@ -5,7 +5,7 @@
 
 #if !defined(ROCKSDB_LITE) && !defined(OS_WIN)
 
-#include "util/env_chroot.h"
+#include "env/env_chroot.h"
 
 #include <errno.h>
 #include <stdlib.h>

env/env_posix.cc

@@ -40,19 +40,19 @@
 #include <set>
 #include <vector>
 
-#include "rocksdb/options.h"
+#include "env/io_posix.h"
+#include "env/posix_logger.h"
+#include "monitoring/iostats_context_imp.h"
+#include "monitoring/thread_status_updater.h"
 #include "port/port.h"
+#include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "util/coding.h"
-#include "util/io_posix.h"
-#include "util/iostats_context_imp.h"
 #include "util/logging.h"
-#include "util/posix_logger.h"
 #include "util/random.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/thread_local.h"
-#include "util/thread_status_updater.h"
 #include "util/threadpool_imp.h"
 
 #if !defined(TMPFS_MAGIC)

env/env_test.cc

@@ -37,10 +37,10 @@
 #include <errno.h>
 #endif
 
+#include "env/env_chroot.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "util/coding.h"
-#include "util/env_chroot.h"
 #include "util/log_buffer.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"

env/io_posix.cc

@@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #ifdef ROCKSDB_LIB_IO_POSIX
-#include "util/io_posix.h"
+#include "env/io_posix.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <algorithm>
@@ -26,11 +26,11 @@
 #include <sys/statfs.h>
 #include <sys/syscall.h>
 #endif
+#include "env/posix_logger.h"
+#include "monitoring/iostats_context_imp.h"
 #include "port/port.h"
 #include "rocksdb/slice.h"
 #include "util/coding.h"
-#include "util/iostats_context_imp.h"
-#include "util/posix_logger.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 

env/mock_env.cc

@@ -7,13 +7,13 @@
 // 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/mock_env.h"
+#include "env/mock_env.h"
-#include "port/sys_time.h"
 #include <algorithm>
 #include <chrono>
-#include "util/rate_limiter.h"
+#include "port/sys_time.h"
-#include "util/random.h"
 #include "util/murmurhash.h"
+#include "util/random.h"
+#include "util/rate_limiter.h"
 
 namespace rocksdb {
 

env/mock_env_test.cc

@@ -2,7 +2,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/mock_env.h"
+#include "env/mock_env.h"
 
 #include <memory>
 #include <string>

env/posix_logger.h

@@ -23,10 +23,10 @@
 #endif
 #endif
 
+#include <atomic>
+#include "monitoring/iostats_context_imp.h"
 #include "rocksdb/env.h"
-#include "util/iostats_context_imp.h"
 #include "util/sync_point.h"
-#include <atomic>
 
 namespace rocksdb {
 

java/rocksjni/clock_cache.cc

@@ -8,8 +8,8 @@
 
 #include <jni.h>
 
+#include "cache/clock_cache.h"
 #include "include/org_rocksdb_ClockCache.h"
-#include "util/clock_cache.h"
 
 /*
  * Class:     org_rocksdb_ClockCache

java/rocksjni/lru_cache.cc

@@ -8,8 +8,8 @@
 
 #include <jni.h>
 
+#include "cache/lru_cache.h"
 #include "include/org_rocksdb_LRUCache.h"
-#include "util/lru_cache.h"
 
 /*
  * Class:     org_rocksdb_LRUCache

java/rocksjni/write_batch_test.cc

@@ -13,6 +13,7 @@
 #include "include/org_rocksdb_WriteBatchTest.h"
 #include "include/org_rocksdb_WriteBatchTestInternalHelper.h"
 #include "include/org_rocksdb_WriteBatch_Handler.h"
+#include "options/cf_options.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/memtablerep.h"
@@ -21,7 +22,6 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "rocksjni/portal.h"
 #include "table/scoped_arena_iterator.h"
-#include "util/cf_options.h"
 #include "util/logging.h"
 #include "util/testharness.h"
 

memtable/hash_linklist_rep.cc

@@ -9,15 +9,15 @@
 
 #include <algorithm>
 #include <atomic>
+#include "db/memtable.h"
+#include "db/skiplist.h"
+#include "monitoring/histogram.h"
+#include "port/port.h"
 #include "rocksdb/memtablerep.h"
-#include "util/arena.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-#include "port/port.h"
+#include "util/arena.h"
-#include "util/histogram.h"
 #include "util/murmurhash.h"
-#include "db/memtable.h"
-#include "db/skiplist.h"
 
 namespace rocksdb {
 namespace {

monitoring/histogram.cc

@@ -11,7 +11,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include "util/histogram.h"
+#include "monitoring/histogram.h"
 
 #include <inttypes.h>
 #include <cassert>

monitoring/histogram_test.cc

@@ -5,8 +5,8 @@
 //
 #include <cmath>
 
-#include "util/histogram.h"
+#include "monitoring/histogram.h"
-#include "util/histogram_windowing.h"
+#include "monitoring/histogram_windowing.h"
 #include "util/testharness.h"
 
 namespace rocksdb {

monitoring/histogram_windowing.cc

@@ -7,8 +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 "util/histogram.h"
+#include "monitoring/histogram_windowing.h"
-#include "util/histogram_windowing.h"
+#include "monitoring/histogram.h"
 
 #include <algorithm>
 

monitoring/histogram_windowing.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "util/histogram.h"
+#include "monitoring/histogram.h"
 #include "rocksdb/env.h"
 
 namespace rocksdb {

monitoring/instrumented_mutex.cc

@@ -3,10 +3,10 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 
-#include "util/instrumented_mutex.h"
+#include "monitoring/instrumented_mutex.h"
-#include "util/perf_context_imp.h"
+#include "monitoring/perf_context_imp.h"
+#include "monitoring/thread_status_util.h"
 #include "util/sync_point.h"
-#include "util/thread_status_util.h"
 
 namespace rocksdb {
 namespace {

monitoring/instrumented_mutex.h

@@ -5,11 +5,11 @@
 
 #pragma once
 
+#include "monitoring/statistics.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/thread_status.h"
-#include "util/statistics.h"
 #include "util/stop_watch.h"
 
 namespace rocksdb {

monitoring/iostats_context.cc

@@ -4,8 +4,8 @@
 // of patent rights can be found in the PATENTS file in the same directory.
 
 #include <sstream>
+#include "monitoring/iostats_context_imp.h"
 #include "rocksdb/env.h"
-#include "util/iostats_context_imp.h"
 
 namespace rocksdb {
 

monitoring/iostats_context_imp.h

@@ -4,8 +4,8 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
 #pragma once
+#include "monitoring/perf_step_timer.h"
 #include "rocksdb/iostats_context.h"
-#include "util/perf_step_timer.h"
 
 #ifndef IOS_CROSS_COMPILE
 

monitoring/perf_context.cc

@@ -5,7 +5,7 @@
 //
 
 #include <sstream>
-#include "util/perf_context_imp.h"
+#include "monitoring/perf_context_imp.h"
 
 namespace rocksdb {
 

monitoring/perf_context_imp.h

@@ -4,8 +4,8 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
 #pragma once
+#include "monitoring/perf_step_timer.h"
 #include "rocksdb/perf_context.h"
-#include "util/perf_step_timer.h"
 #include "util/stop_watch.h"
 
 namespace rocksdb {

monitoring/perf_level.cc

@@ -6,8 +6,8 @@
 
 #include <assert.h>
 #include <sstream>
+#include "monitoring/perf_level_imp.h"
 #include "port/port.h"
-#include "util/perf_level_imp.h"
 
 namespace rocksdb {
 

monitoring/perf_step_timer.h

@@ -4,8 +4,8 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
 #pragma once
+#include "monitoring/perf_level_imp.h"
 #include "rocksdb/env.h"
-#include "util/perf_level_imp.h"
 #include "util/stop_watch.h"
 
 namespace rocksdb {

monitoring/statistics.cc

@@ -3,7 +3,7 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
-#include "util/statistics.h"
+#include "monitoring/statistics.h"
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
@@ -179,7 +179,7 @@ void StatisticsImpl::measureTime(uint32_t histogramType, uint64_t value) {
 namespace {
 
 // a buffer size used for temp string buffers
-const int kBufferSize = 200;
+const int kTmpStrBufferSize = 200;
 
 } // namespace
 
@@ -188,19 +188,19 @@ std::string StatisticsImpl::ToString() const {
   res.reserve(20000);
   for (const auto& t : TickersNameMap) {
     if (t.first < TICKER_ENUM_MAX || enable_internal_stats_) {
-      char buffer[kBufferSize];
+      char buffer[kTmpStrBufferSize];
-      snprintf(buffer, kBufferSize, "%s COUNT : %" PRIu64 "\n",
+      snprintf(buffer, kTmpStrBufferSize, "%s COUNT : %" PRIu64 "\n",
                t.second.c_str(), getTickerCount(t.first));
       res.append(buffer);
     }
   }
   for (const auto& h : HistogramsNameMap) {
     if (h.first < HISTOGRAM_ENUM_MAX || enable_internal_stats_) {
-      char buffer[kBufferSize];
+      char buffer[kTmpStrBufferSize];
       HistogramData hData;
       histogramData(h.first, &hData);
       snprintf(
-          buffer, kBufferSize,
+          buffer, kTmpStrBufferSize,
           "%s statistics Percentiles :=> 50 : %f 95 : %f 99 : %f 100 : %f\n",
           h.second.c_str(), hData.median, hData.percentile95,
           hData.percentile99, hData.max);

monitoring/statistics.h

@@ -10,9 +10,9 @@
 #include <atomic>
 #include <string>
 
+#include "monitoring/histogram.h"
 #include "port/likely.h"
 #include "port/port.h"
-#include "util/histogram.h"
 #include "util/mutexlock.h"
 #include "util/thread_local.h"
 

monitoring/thread_status_updater.cc

@@ -3,10 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-#include "util/thread_status_updater.h"
+#include "monitoring/thread_status_updater.h"
 #include <memory>
-#include "rocksdb/env.h"
 #include "port/likely.h"
+#include "rocksdb/env.h"
 #include "util/mutexlock.h"
 
 namespace rocksdb {