diff --git a/CMakeLists.txt b/CMakeLists.txt index 63d93c29f1..e8ca64d544 100644 --- a/CMakeLists.txt +++ b/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 $) if(WIN32) @@ -488,8 +487,8 @@ if(WIN32) else() list(APPEND SOURCES port/port_posix.cc - util/env_posix.cc - util/io_posix.cc) + env/env_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() diff --git a/Makefile b/Makefile index e7959e5f1b..b7565f52c2 100644 --- a/Makefile +++ b/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) diff --git a/util/cache_bench.cc b/cache/cache_bench.cc similarity index 100% rename from util/cache_bench.cc rename to cache/cache_bench.cc diff --git a/util/cache_test.cc b/cache/cache_test.cc similarity index 99% rename from util/cache_test.cc rename to cache/cache_test.cc index 9d6bdafdff..ac36a73171 100644 --- a/util/cache_test.cc +++ b/cache/cache_test.cc @@ -14,9 +14,9 @@ #include #include #include -#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" diff --git a/util/clock_cache.cc b/cache/clock_cache.cc similarity index 99% rename from util/clock_cache.cc rename to cache/clock_cache.cc index 50384a3ea3..d314a9237b 100644 --- a/util/clock_cache.cc +++ b/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 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 { diff --git a/util/clock_cache.h b/cache/clock_cache.h similarity index 100% rename from util/clock_cache.h rename to cache/clock_cache.h diff --git a/util/lru_cache.cc b/cache/lru_cache.cc similarity index 99% rename from util/lru_cache.cc rename to cache/lru_cache.cc index 9a23092086..cb94a4c672 100644 --- a/util/lru_cache.cc +++ b/cache/lru_cache.cc @@ -11,7 +11,7 @@ #define __STDC_FORMAT_MACROS #endif -#include "util/lru_cache.h" +#include "cache/lru_cache.h" #include #include diff --git a/util/lru_cache.h b/cache/lru_cache.h similarity index 99% rename from util/lru_cache.h rename to cache/lru_cache.h index 800edac04d..a1366d2b80 100644 --- a/util/lru_cache.h +++ b/cache/lru_cache.h @@ -10,7 +10,7 @@ #include -#include "util/sharded_cache.h" +#include "cache/sharded_cache.h" #include "port/port.h" #include "util/autovector.h" diff --git a/util/lru_cache_test.cc b/cache/lru_cache_test.cc similarity index 99% rename from util/lru_cache_test.cc rename to cache/lru_cache_test.cc index 25e2911900..038ac1eafe 100644 --- a/util/lru_cache_test.cc +++ b/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 #include diff --git a/util/sharded_cache.cc b/cache/sharded_cache.cc similarity index 99% rename from util/sharded_cache.cc rename to cache/sharded_cache.cc index c27fd6c977..4765786b39 100644 --- a/util/sharded_cache.cc +++ b/cache/sharded_cache.cc @@ -11,7 +11,7 @@ #define __STDC_FORMAT_MACROS #endif -#include "util/sharded_cache.h" +#include "cache/sharded_cache.h" #include diff --git a/util/sharded_cache.h b/cache/sharded_cache.h similarity index 100% rename from util/sharded_cache.h rename to cache/sharded_cache.h diff --git a/db/builder.cc b/db/builder.cc index e0020622e7..ba233b43a2 100644 --- a/db/builder.cc +++ b/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 { diff --git a/db/builder.h b/db/builder.h index 4b166d1f8a..6cb7ca0da7 100644 --- a/db/builder.h +++ b/db/builder.h @@ -10,6 +10,7 @@ #include #include #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 { diff --git a/db/column_family.cc b/db/column_family.cc index b71d3d1cf9..f3f61da233 100644 --- a/db/column_family.cc +++ b/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 { diff --git a/db/column_family.h b/db/column_family.h index 2bf579a4a8..07d57a7221 100644 --- a/db/column_family.h +++ b/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 { diff --git a/db/column_family_test.cc b/db/column_family_test.cc index c904395036..53afdcab36 100644 --- a/db/column_family_test.cc +++ b/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" diff --git a/db/compaction.h b/db/compaction.h index c2656b77b9..f80c5af824 100644 --- a/db/compaction.h +++ b/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 { diff --git a/db/compaction_job.cc b/db/compaction_job.cc index ecbce1e6e5..f2112ee326 100644 --- a/db/compaction_job.cc +++ b/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 { diff --git a/db/compaction_job.h b/db/compaction_job.h index be94520ea2..0bb44b2a7f 100644 --- a/db/compaction_job.h +++ b/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" diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc index 00f6d37be9..3cb180fb3c 100644 --- a/db/compaction_job_stats_test.cc +++ b/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) diff --git a/db/compaction_picker.cc b/db/compaction_picker.cc index d64f33018d..7c2e8d1239 100644 --- a/db/compaction_picker.cc +++ b/db/compaction_picker.cc @@ -19,10 +19,10 @@ #include #include #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" diff --git a/db/compaction_picker.h b/db/compaction_picker.h index 6a3ff2c42e..b1905f3481 100644 --- a/db/compaction_picker.h +++ b/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 { diff --git a/db/db_block_cache_test.cc b/db/db_block_cache_test.cc index 8869cb3b1e..6ca5f781b5 100644 --- a/db/db_block_cache_test.cc +++ b/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 +#include "cache/lru_cache.h" #include "db/db_test_util.h" #include "port/stack_trace.h" -#include "util/lru_cache.h" namespace rocksdb { diff --git a/db/db_impl.cc b/db/db_impl.cc index 3843a4d80c..175d3e73c6 100644 --- a/db/db_impl.cc +++ b/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"); diff --git a/db/db_impl.h b/db/db_impl.h index 84f0ce0c63..1831dee22c 100644 --- a/db/db_impl.h +++ b/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" diff --git a/db/db_impl_compaction_flush.cc b/db/db_impl_compaction_flush.cc index 6cf004a1a7..70ff1af043 100644 --- a/db/db_impl_compaction_flush.cc +++ b/db/db_impl_compaction_flush.cc @@ -14,12 +14,12 @@ #include #include "db/builder.h" -#include "util/iostats_context_imp.h" -#include "util/perf_context_imp.h" +#include "monitoring/iostats_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 "util/thread_status_util.h" +#include "monitoring/thread_status_updater.h" +#include "monitoring/thread_status_util.h" namespace rocksdb { Status DBImpl::SyncClosedLogs(JobContext* job_context) { diff --git a/db/db_impl_debug.cc b/db/db_impl_debug.cc index 8df5601d50..cb83146091 100644 --- a/db/db_impl_debug.cc +++ b/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 { diff --git a/db/db_impl_open.cc b/db/db_impl_open.cc index 80d6f0f8b9..468cb6c88f 100644 --- a/db/db_impl_open.cc +++ b/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" diff --git a/db/db_impl_readonly.cc b/db/db_impl_readonly.cc index 7537e4f4c4..873c37c8f5 100644 --- a/db/db_impl_readonly.cc +++ b/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 { diff --git a/db/db_impl_write.cc b/db/db_impl_write.cc index 49e68d056e..154e4dc819 100644 --- a/db/db_impl_write.cc +++ b/db/db_impl_write.cc @@ -12,8 +12,8 @@ #define __STDC_FORMAT_MACROS #endif #include -#include "util/options_helper.h" -#include "util/perf_context_imp.h" +#include "options/options_helper.h" +#include "monitoring/perf_context_imp.h" #include "util/sync_point.h" namespace rocksdb { diff --git a/db/db_info_dumper.h b/db/db_info_dumper.h index c142ab2338..5b193c59bd 100644 --- a/db/db_info_dumper.h +++ b/db/db_info_dumper.h @@ -6,7 +6,7 @@ #include -#include "util/db_options.h" +#include "options/db_options.h" namespace rocksdb { void DumpDBFileSummary(const ImmutableDBOptions& options, diff --git a/db/db_iter.cc b/db/db_iter.cc index 20850cf9b5..52ec352ad4 100644 --- a/db/db_iter.cc +++ b/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 { diff --git a/db/db_iter.h b/db/db_iter.h index cab42b8460..6bf68d7253 100644 --- a/db/db_iter.h +++ b/db/db_iter.h @@ -12,11 +12,11 @@ #include #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 { diff --git a/db/db_options_test.cc b/db/db_options_test.cc index 1a4ad5eb19..110be5de05 100644 --- a/db/db_options_test.cc +++ b/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" diff --git a/db/db_test.cc b/db/db_test.cc index 3383aaaab3..dfe552e3c0 100644 --- a/db/db_test.cc +++ b/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 { diff --git a/db/db_test_util.h b/db/db_test_util.h index ca4c8a7aa9..65e983a506 100644 --- a/db/db_test_util.h +++ b/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" diff --git a/db/db_wal_test.cc b/db/db_wal_test.cc index 715c5056ed..58178c429a 100644 --- a/db/db_wal_test.cc +++ b/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 { diff --git a/db/dbformat.cc b/db/dbformat.cc index cf606a5c3c..ce1553be5e 100644 --- a/db/dbformat.cc +++ b/db/dbformat.cc @@ -14,9 +14,9 @@ #include #include +#include "monitoring/perf_context_imp.h" #include "port/port.h" #include "util/coding.h" -#include "util/perf_context_imp.h" namespace rocksdb { diff --git a/db/external_sst_file_ingestion_job.h b/db/external_sst_file_ingestion_job.h index d711d5dc2c..9efa19e9dc 100644 --- a/db/external_sst_file_ingestion_job.h +++ b/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 { diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc index 044528a324..03f9c0ad37 100644 --- a/db/fault_injection_test.cc +++ b/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" diff --git a/db/flush_job.cc b/db/flush_job.cc index 76a7da778b..fe68e3199a 100644 --- a/db/flush_job.cc +++ b/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 { diff --git a/db/flush_job.h b/db/flush_job.h index 31672dd279..dcd40938b5 100644 --- a/db/flush_job.h +++ b/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" diff --git a/db/listener_test.cc b/db/listener_test.cc index 881fc4fe5a..8aa107b8eb 100644 --- a/db/listener_test.cc +++ b/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" diff --git a/db/memtable.cc b/db/memtable.cc index 0ecd36f7ef..206372951f 100644 --- a/db/memtable.cc +++ b/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 { diff --git a/db/memtable.h b/db/memtable.h index 2417a11308..a37aac03d7 100644 --- a/db/memtable.h +++ b/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 { diff --git a/db/memtable_list.cc b/db/memtable_list.cc index 51d62b25ac..2977e7a56f 100644 --- a/db/memtable_list.cc +++ b/db/memtable_list.cc @@ -13,6 +13,7 @@ #include #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 { diff --git a/db/memtable_list.h b/db/memtable_list.h index 332007d3b4..26d386c8bb 100644 --- a/db/memtable_list.h +++ b/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 { diff --git a/db/merge_helper.cc b/db/merge_helper.cc index b798dfd0e4..aa5570579e 100644 --- a/db/merge_helper.cc +++ b/db/merge_helper.cc @@ -9,12 +9,12 @@ #include #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 { diff --git a/db/perf_context_test.cc b/db/perf_context_test.cc index 2df0b79b9f..eac6053ed4 100644 --- a/db/perf_context_test.cc +++ b/db/perf_context_test.cc @@ -8,17 +8,17 @@ #include #include +#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; diff --git a/db/prefix_test.cc b/db/prefix_test.cc index b1e43dd8e0..bcd0b63e08 100644 --- a/db/prefix_test.cc +++ b/db/prefix_test.cc @@ -19,6 +19,7 @@ int main() { #include #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" diff --git a/db/repair.cc b/db/repair.cc index 4cfae4a05d..4cd6aa03fe 100644 --- a/db/repair.cc +++ b/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" diff --git a/db/table_cache.cc b/db/table_cache.cc index 36e821517c..c1caa8b0eb 100644 --- a/db/table_cache.cc +++ b/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" diff --git a/db/table_cache.h b/db/table_cache.h index 7165283b66..2c66cc7dba 100644 --- a/db/table_cache.h +++ b/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 { diff --git a/db/table_properties_collector_test.cc b/db/table_properties_collector_test.cc index ab0d5a37bc..89acfe4b32 100644 --- a/db/table_properties_collector_test.cc +++ b/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" diff --git a/db/transaction_log_impl.h b/db/transaction_log_impl.h index a901758cd7..82712084cd 100644 --- a/db/transaction_log_impl.h +++ b/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 { diff --git a/db/version_set.cc b/db/version_set.cc index ec4d6eb7dc..ef650b8b59 100644 --- a/db/version_set.cc +++ b/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" diff --git a/db/version_set.h b/db/version_set.h index 818a86fea9..22b382e971 100644 --- a/db/version_set.h +++ b/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 { diff --git a/db/wal_manager.h b/db/wal_manager.h index 532772aecf..bc32c9941a 100644 --- a/db/wal_manager.h +++ b/db/wal_manager.h @@ -18,12 +18,12 @@ #include #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 { diff --git a/db/wal_manager_test.cc b/db/wal_manager_test.cc index 33435c10b4..1cf3c2f661 100644 --- a/db/wal_manager_test.cc +++ b/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 { diff --git a/db/write_batch.cc b/db/write_batch.cc index dd1210f7b3..2270b1ef35 100644 --- a/db/write_batch.cc +++ b/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 { diff --git a/db/write_thread.h b/db/write_thread.h index 5af6547b92..0c3f6fcbc6 100644 --- a/db/write_thread.h +++ b/db/write_thread.h @@ -15,12 +15,12 @@ #include #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 { diff --git a/util/env.cc b/env/env.cc similarity index 100% rename from util/env.cc rename to env/env.cc diff --git a/util/env_basic_test.cc b/env/env_basic_test.cc similarity index 99% rename from util/env_basic_test.cc rename to env/env_basic_test.cc index c92c0a14f0..254c71fadc 100644 --- a/util/env_basic_test.cc +++ b/env/env_basic_test.cc @@ -7,9 +7,9 @@ #include #include +#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 { diff --git a/util/env_chroot.cc b/env/env_chroot.cc similarity index 99% rename from util/env_chroot.cc rename to env/env_chroot.cc index 3d3e258c59..9b7c205d18 100644 --- a/util/env_chroot.cc +++ b/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 #include diff --git a/util/env_chroot.h b/env/env_chroot.h similarity index 100% rename from util/env_chroot.h rename to env/env_chroot.h diff --git a/util/env_hdfs.cc b/env/env_hdfs.cc similarity index 100% rename from util/env_hdfs.cc rename to env/env_hdfs.cc diff --git a/util/env_posix.cc b/env/env_posix.cc similarity index 99% rename from util/env_posix.cc rename to env/env_posix.cc index 712a8eca98..2d1e6cb69d 100644 --- a/util/env_posix.cc +++ b/env/env_posix.cc @@ -40,19 +40,19 @@ #include #include -#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) diff --git a/util/env_test.cc b/env/env_test.cc similarity index 99% rename from util/env_test.cc rename to env/env_test.cc index 49f54cb0f5..08deba72f0 100644 --- a/util/env_test.cc +++ b/env/env_test.cc @@ -37,10 +37,10 @@ #include #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" diff --git a/util/io_posix.cc b/env/io_posix.cc similarity index 99% rename from util/io_posix.cc rename to env/io_posix.cc index b61f4b38f5..776b99feb3 100644 --- a/util/io_posix.cc +++ b/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 #include #include @@ -26,11 +26,11 @@ #include #include #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" diff --git a/util/io_posix.h b/env/io_posix.h similarity index 100% rename from util/io_posix.h rename to env/io_posix.h diff --git a/util/memenv.cc b/env/memenv.cc similarity index 100% rename from util/memenv.cc rename to env/memenv.cc diff --git a/util/mock_env.cc b/env/mock_env.cc similarity index 99% rename from util/mock_env.cc rename to env/mock_env.cc index 08b2b250d5..9e99048436 100644 --- a/util/mock_env.cc +++ b/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 "port/sys_time.h" +#include "env/mock_env.h" #include #include -#include "util/rate_limiter.h" -#include "util/random.h" +#include "port/sys_time.h" #include "util/murmurhash.h" +#include "util/random.h" +#include "util/rate_limiter.h" namespace rocksdb { diff --git a/util/mock_env.h b/env/mock_env.h similarity index 100% rename from util/mock_env.h rename to env/mock_env.h diff --git a/util/mock_env_test.cc b/env/mock_env_test.cc similarity index 98% rename from util/mock_env_test.cc rename to env/mock_env_test.cc index 1f6ccedf73..19e259ccd8 100644 --- a/util/mock_env_test.cc +++ b/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 #include diff --git a/util/posix_logger.h b/env/posix_logger.h similarity index 99% rename from util/posix_logger.h rename to env/posix_logger.h index 9450f3b921..81b54ac2d2 100644 --- a/util/posix_logger.h +++ b/env/posix_logger.h @@ -23,10 +23,10 @@ #endif #endif -#include "rocksdb/env.h" -#include "util/iostats_context_imp.h" -#include "util/sync_point.h" #include +#include "monitoring/iostats_context_imp.h" +#include "rocksdb/env.h" +#include "util/sync_point.h" namespace rocksdb { diff --git a/java/rocksjni/clock_cache.cc b/java/rocksjni/clock_cache.cc index fa6cda27ba..1776ae058f 100644 --- a/java/rocksjni/clock_cache.cc +++ b/java/rocksjni/clock_cache.cc @@ -8,8 +8,8 @@ #include +#include "cache/clock_cache.h" #include "include/org_rocksdb_ClockCache.h" -#include "util/clock_cache.h" /* * Class: org_rocksdb_ClockCache diff --git a/java/rocksjni/lru_cache.cc b/java/rocksjni/lru_cache.cc index 5157c2a07f..87b45b0f03 100644 --- a/java/rocksjni/lru_cache.cc +++ b/java/rocksjni/lru_cache.cc @@ -8,8 +8,8 @@ #include +#include "cache/lru_cache.h" #include "include/org_rocksdb_LRUCache.h" -#include "util/lru_cache.h" /* * Class: org_rocksdb_LRUCache diff --git a/java/rocksjni/write_batch_test.cc b/java/rocksjni/write_batch_test.cc index 254374c3b1..6953555947 100644 --- a/java/rocksjni/write_batch_test.cc +++ b/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" diff --git a/memtable/hash_linklist_rep.cc b/memtable/hash_linklist_rep.cc index df2cf6cef1..48a6d9897a 100644 --- a/memtable/hash_linklist_rep.cc +++ b/memtable/hash_linklist_rep.cc @@ -9,15 +9,15 @@ #include #include -#include "rocksdb/memtablerep.h" -#include "util/arena.h" -#include "rocksdb/slice.h" -#include "rocksdb/slice_transform.h" -#include "port/port.h" -#include "util/histogram.h" -#include "util/murmurhash.h" #include "db/memtable.h" #include "db/skiplist.h" +#include "monitoring/histogram.h" +#include "port/port.h" +#include "rocksdb/memtablerep.h" +#include "rocksdb/slice.h" +#include "rocksdb/slice_transform.h" +#include "util/arena.h" +#include "util/murmurhash.h" namespace rocksdb { namespace { diff --git a/util/histogram.cc b/monitoring/histogram.cc similarity index 99% rename from util/histogram.cc rename to monitoring/histogram.cc index 0358b9acba..5f3178d104 100644 --- a/util/histogram.cc +++ b/monitoring/histogram.cc @@ -11,7 +11,7 @@ #define __STDC_FORMAT_MACROS #endif -#include "util/histogram.h" +#include "monitoring/histogram.h" #include #include diff --git a/util/histogram.h b/monitoring/histogram.h similarity index 100% rename from util/histogram.h rename to monitoring/histogram.h diff --git a/util/histogram_test.cc b/monitoring/histogram_test.cc similarity index 98% rename from util/histogram_test.cc rename to monitoring/histogram_test.cc index 47d9c65ba3..f9190cf6ba 100644 --- a/util/histogram_test.cc +++ b/monitoring/histogram_test.cc @@ -5,8 +5,8 @@ // #include -#include "util/histogram.h" -#include "util/histogram_windowing.h" +#include "monitoring/histogram.h" +#include "monitoring/histogram_windowing.h" #include "util/testharness.h" namespace rocksdb { diff --git a/util/histogram_windowing.cc b/monitoring/histogram_windowing.cc similarity index 98% rename from util/histogram_windowing.cc rename to monitoring/histogram_windowing.cc index 165d6592b6..076d8d89fe 100644 --- a/util/histogram_windowing.cc +++ b/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 "util/histogram_windowing.h" +#include "monitoring/histogram_windowing.h" +#include "monitoring/histogram.h" #include diff --git a/util/histogram_windowing.h b/monitoring/histogram_windowing.h similarity index 97% rename from util/histogram_windowing.h rename to monitoring/histogram_windowing.h index cdcf1ba8ac..584e626b31 100644 --- a/util/histogram_windowing.h +++ b/monitoring/histogram_windowing.h @@ -9,7 +9,7 @@ #pragma once -#include "util/histogram.h" +#include "monitoring/histogram.h" #include "rocksdb/env.h" namespace rocksdb { diff --git a/util/instrumented_mutex.cc b/monitoring/instrumented_mutex.cc similarity index 95% rename from util/instrumented_mutex.cc rename to monitoring/instrumented_mutex.cc index c00855943a..ef3805b497 100644 --- a/util/instrumented_mutex.cc +++ b/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 "util/perf_context_imp.h" +#include "monitoring/instrumented_mutex.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 { diff --git a/util/instrumented_mutex.h b/monitoring/instrumented_mutex.h similarity index 98% rename from util/instrumented_mutex.h rename to monitoring/instrumented_mutex.h index 45d553ae8d..a1c31e1385 100644 --- a/util/instrumented_mutex.h +++ b/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 { diff --git a/util/iostats_context.cc b/monitoring/iostats_context.cc similarity index 97% rename from util/iostats_context.cc rename to monitoring/iostats_context.cc index ecb6a1582a..e9970e1f7e 100644 --- a/util/iostats_context.cc +++ b/monitoring/iostats_context.cc @@ -4,8 +4,8 @@ // of patent rights can be found in the PATENTS file in the same directory. #include +#include "monitoring/iostats_context_imp.h" #include "rocksdb/env.h" -#include "util/iostats_context_imp.h" namespace rocksdb { diff --git a/util/iostats_context_imp.h b/monitoring/iostats_context_imp.h similarity index 97% rename from util/iostats_context_imp.h rename to monitoring/iostats_context_imp.h index d0464ce0cf..1a4d7bd046 100644 --- a/util/iostats_context_imp.h +++ b/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 diff --git a/util/iostats_context_test.cc b/monitoring/iostats_context_test.cc similarity index 100% rename from util/iostats_context_test.cc rename to monitoring/iostats_context_test.cc diff --git a/util/perf_context.cc b/monitoring/perf_context.cc similarity index 99% rename from util/perf_context.cc rename to monitoring/perf_context.cc index b124f8d0f6..69b33fca40 100644 --- a/util/perf_context.cc +++ b/monitoring/perf_context.cc @@ -5,7 +5,7 @@ // #include -#include "util/perf_context_imp.h" +#include "monitoring/perf_context_imp.h" namespace rocksdb { diff --git a/util/perf_context_imp.h b/monitoring/perf_context_imp.h similarity index 97% rename from util/perf_context_imp.h rename to monitoring/perf_context_imp.h index ee1a7c318d..fa0910670e 100644 --- a/util/perf_context_imp.h +++ b/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 { diff --git a/util/perf_level.cc b/monitoring/perf_level.cc similarity index 94% rename from util/perf_level.cc rename to monitoring/perf_level.cc index 5d2ae4b47b..0b704c32fc 100644 --- a/util/perf_level.cc +++ b/monitoring/perf_level.cc @@ -6,8 +6,8 @@ #include #include +#include "monitoring/perf_level_imp.h" #include "port/port.h" -#include "util/perf_level_imp.h" namespace rocksdb { diff --git a/util/perf_level_imp.h b/monitoring/perf_level_imp.h similarity index 100% rename from util/perf_level_imp.h rename to monitoring/perf_level_imp.h diff --git a/util/perf_step_timer.h b/monitoring/perf_step_timer.h similarity index 96% rename from util/perf_step_timer.h rename to monitoring/perf_step_timer.h index 33a709f93e..673a933bfa 100644 --- a/util/perf_step_timer.h +++ b/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 { diff --git a/util/statistics.cc b/monitoring/statistics.cc similarity index 96% rename from util/statistics.cc rename to monitoring/statistics.cc index 4d83d48156..c9b86cdcc4 100644 --- a/util/statistics.cc +++ b/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]; - snprintf(buffer, kBufferSize, "%s COUNT : %" PRIu64 "\n", + char buffer[kTmpStrBufferSize]; + 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); diff --git a/util/statistics.h b/monitoring/statistics.h similarity index 99% rename from util/statistics.h rename to monitoring/statistics.h index 0f2e6c8e21..b64dc4fb43 100644 --- a/util/statistics.h +++ b/monitoring/statistics.h @@ -10,9 +10,9 @@ #include #include +#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" diff --git a/util/statistics_test.cc b/monitoring/statistics_test.cc similarity index 100% rename from util/statistics_test.cc rename to monitoring/statistics_test.cc diff --git a/util/thread_status_impl.cc b/monitoring/thread_status_impl.cc similarity index 100% rename from util/thread_status_impl.cc rename to monitoring/thread_status_impl.cc diff --git a/util/thread_status_updater.cc b/monitoring/thread_status_updater.cc similarity index 99% rename from util/thread_status_updater.cc rename to monitoring/thread_status_updater.cc index 40ba5b3377..aa925e6dcd 100644 --- a/util/thread_status_updater.cc +++ b/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 -#include "rocksdb/env.h" #include "port/likely.h" +#include "rocksdb/env.h" #include "util/mutexlock.h" namespace rocksdb { diff --git a/util/thread_status_updater.h b/monitoring/thread_status_updater.h similarity index 100% rename from util/thread_status_updater.h rename to monitoring/thread_status_updater.h diff --git a/util/thread_status_updater_debug.cc b/monitoring/thread_status_updater_debug.cc similarity index 96% rename from util/thread_status_updater_debug.cc rename to monitoring/thread_status_updater_debug.cc index 647ef0de50..b729d47d7c 100644 --- a/util/thread_status_updater_debug.cc +++ b/monitoring/thread_status_updater_debug.cc @@ -5,8 +5,8 @@ #include -#include "util/thread_status_updater.h" #include "db/column_family.h" +#include "monitoring/thread_status_updater.h" namespace rocksdb { diff --git a/util/thread_status_util.cc b/monitoring/thread_status_util.cc similarity index 98% rename from util/thread_status_util.cc rename to monitoring/thread_status_util.cc index 06560083d4..19d86cecfb 100644 --- a/util/thread_status_util.cc +++ b/monitoring/thread_status_util.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_util.h" +#include "monitoring/thread_status_util.h" +#include "monitoring/thread_status_updater.h" #include "rocksdb/env.h" -#include "util/thread_status_updater.h" namespace rocksdb { diff --git a/util/thread_status_util.h b/monitoring/thread_status_util.h similarity index 99% rename from util/thread_status_util.h rename to monitoring/thread_status_util.h index 455c9f14fb..9869bc5f81 100644 --- a/util/thread_status_util.h +++ b/monitoring/thread_status_util.h @@ -7,10 +7,10 @@ #include +#include "monitoring/thread_status_updater.h" #include "rocksdb/db.h" #include "rocksdb/env.h" #include "rocksdb/thread_status.h" -#include "util/thread_status_updater.h" namespace rocksdb { diff --git a/util/thread_status_util_debug.cc b/monitoring/thread_status_util_debug.cc similarity index 91% rename from util/thread_status_util_debug.cc rename to monitoring/thread_status_util_debug.cc index 355bd97849..fb8dc04a35 100644 --- a/util/thread_status_util_debug.cc +++ b/monitoring/thread_status_util_debug.cc @@ -5,9 +5,9 @@ #include +#include "monitoring/thread_status_updater.h" +#include "monitoring/thread_status_util.h" #include "rocksdb/env.h" -#include "util/thread_status_updater.h" -#include "util/thread_status_util.h" namespace rocksdb { diff --git a/util/cf_options.cc b/options/cf_options.cc similarity index 99% rename from util/cf_options.cc rename to options/cf_options.cc index 67dbd8f4eb..6e0d520805 100644 --- a/util/cf_options.cc +++ b/options/cf_options.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/cf_options.h" +#include "options/cf_options.h" #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS @@ -13,10 +13,10 @@ #include #include #include +#include "options/db_options.h" #include "port/port.h" #include "rocksdb/env.h" #include "rocksdb/options.h" -#include "util/db_options.h" namespace rocksdb { diff --git a/util/cf_options.h b/options/cf_options.h similarity index 99% rename from util/cf_options.h rename to options/cf_options.h index 5d768c12f8..714d4137ed 100644 --- a/util/cf_options.h +++ b/options/cf_options.h @@ -9,9 +9,9 @@ #include #include "db/dbformat.h" +#include "options/db_options.h" #include "rocksdb/options.h" #include "util/compression.h" -#include "util/db_options.h" namespace rocksdb { diff --git a/util/db_options.cc b/options/db_options.cc similarity index 99% rename from util/db_options.cc rename to options/db_options.cc index bdb92e849b..f1d1fad3d8 100644 --- a/util/db_options.cc +++ b/options/db_options.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/db_options.h" +#include "options/db_options.h" #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS diff --git a/util/db_options.h b/options/db_options.h similarity index 100% rename from util/db_options.h rename to options/db_options.h diff --git a/util/options.cc b/options/options.cc similarity index 99% rename from util/options.cc rename to options/options.cc index 612d4b2eb0..2b35c043f2 100644 --- a/util/options.cc +++ b/options/options.cc @@ -16,6 +16,9 @@ #include #include +#include "monitoring/statistics.h" +#include "options/db_options.h" +#include "options/options_helper.h" #include "rocksdb/cache.h" #include "rocksdb/compaction_filter.h" #include "rocksdb/comparator.h" @@ -30,9 +33,6 @@ #include "rocksdb/wal_filter.h" #include "table/block_based_table_factory.h" #include "util/compression.h" -#include "util/db_options.h" -#include "util/options_helper.h" -#include "util/statistics.h" namespace rocksdb { diff --git a/util/options_helper.cc b/options/options_helper.cc similarity index 99% rename from util/options_helper.cc rename to options/options_helper.cc index a035a6bc0f..9c9fd2fb0d 100644 --- a/util/options_helper.cc +++ b/options/options_helper.cc @@ -2,7 +2,7 @@ // This source code is licensed under the BSD-style license found in the // 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/options_helper.h" +#include "options/options_helper.h" #include #include diff --git a/util/options_helper.h b/options/options_helper.h similarity index 99% rename from util/options_helper.h rename to options/options_helper.h index fe830b8604..93160d47fc 100644 --- a/util/options_helper.h +++ b/options/options_helper.h @@ -10,11 +10,11 @@ #include #include +#include "options/cf_options.h" +#include "options/db_options.h" #include "rocksdb/options.h" #include "rocksdb/status.h" #include "rocksdb/table.h" -#include "util/cf_options.h" -#include "util/db_options.h" namespace rocksdb { diff --git a/util/options_parser.cc b/options/options_parser.cc similarity index 99% rename from util/options_parser.cc rename to options/options_parser.cc index 58cc19ba58..b9db968a07 100644 --- a/util/options_parser.cc +++ b/options/options_parser.cc @@ -5,7 +5,7 @@ #ifndef ROCKSDB_LITE -#include "util/options_parser.h" +#include "options/options_parser.h" #include #include @@ -13,9 +13,9 @@ #include #include +#include "options/options_helper.h" #include "rocksdb/convenience.h" #include "rocksdb/db.h" -#include "util/options_helper.h" #include "util/string_util.h" #include "util/sync_point.h" diff --git a/util/options_parser.h b/options/options_parser.h similarity index 98% rename from util/options_parser.h rename to options/options_parser.h index 0c96df83e7..ba173c5786 100644 --- a/util/options_parser.h +++ b/options/options_parser.h @@ -9,10 +9,10 @@ #include #include +#include "options/options_helper.h" +#include "options/options_sanity_check.h" #include "rocksdb/env.h" #include "rocksdb/options.h" -#include "util/options_helper.h" -#include "util/options_sanity_check.h" #include "table/block_based_table_factory.h" namespace rocksdb { diff --git a/util/options_sanity_check.cc b/options/options_sanity_check.cc similarity index 96% rename from util/options_sanity_check.cc rename to options/options_sanity_check.cc index 1294a6ecce..91f8c4d978 100644 --- a/util/options_sanity_check.cc +++ b/options/options_sanity_check.cc @@ -5,7 +5,7 @@ #ifndef ROCKSDB_LITE -#include "util/options_sanity_check.h" +#include "options/options_sanity_check.h" namespace rocksdb { diff --git a/util/options_sanity_check.h b/options/options_sanity_check.h similarity index 100% rename from util/options_sanity_check.h rename to options/options_sanity_check.h diff --git a/util/options_settable_test.cc b/options/options_settable_test.cc similarity index 99% rename from util/options_settable_test.cc rename to options/options_settable_test.cc index 7f3e332edb..218a7bb249 100644 --- a/util/options_settable_test.cc +++ b/options/options_settable_test.cc @@ -16,13 +16,13 @@ #include #include +#include "options/options_helper.h" +#include "options/options_parser.h" +#include "options/options_sanity_check.h" #include "rocksdb/cache.h" #include "rocksdb/convenience.h" #include "rocksdb/memtablerep.h" #include "rocksdb/utilities/leveldb_options.h" -#include "util/options_helper.h" -#include "util/options_parser.h" -#include "util/options_sanity_check.h" #include "util/random.h" #include "util/stderr_logger.h" #include "util/testharness.h" diff --git a/util/options_test.cc b/options/options_test.cc similarity index 99% rename from util/options_test.cc rename to options/options_test.cc index c4156752e2..bc86c8131a 100644 --- a/util/options_test.cc +++ b/options/options_test.cc @@ -16,13 +16,13 @@ #include #include +#include "options/options_helper.h" +#include "options/options_parser.h" +#include "options/options_sanity_check.h" #include "rocksdb/cache.h" #include "rocksdb/convenience.h" #include "rocksdb/memtablerep.h" #include "rocksdb/utilities/leveldb_options.h" -#include "util/options_helper.h" -#include "util/options_parser.h" -#include "util/options_sanity_check.h" #include "util/random.h" #include "util/stderr_logger.h" #include "util/testharness.h" diff --git a/port/util_logger.h b/port/util_logger.h index 05782b0c58..eb659fafdb 100644 --- a/port/util_logger.h +++ b/port/util_logger.h @@ -15,7 +15,7 @@ // of what the new port_.h file must provide. #if defined(ROCKSDB_PLATFORM_POSIX) -#include "util/posix_logger.h" +#include "env/posix_logger.h" #elif defined(OS_WIN) #include "port/win/win_logger.h" #endif diff --git a/port/win/env_win.cc b/port/win/env_win.cc index ee136cc620..09a7269dfb 100644 --- a/port/win/env_win.cc +++ b/port/win/env_win.cc @@ -28,10 +28,10 @@ #include "port/win/win_logger.h" #include "port/win/io_win.h" -#include "util/iostats_context_imp.h" +#include "monitoring/iostats_context_imp.h" -#include "util/thread_status_updater.h" -#include "util/thread_status_util.h" +#include "monitoring/thread_status_updater.h" +#include "monitoring/thread_status_util.h" #include // For UUID generation #include diff --git a/port/win/io_win.cc b/port/win/io_win.cc index f5a3ff8a45..0dd5ed9d15 100644 --- a/port/win/io_win.cc +++ b/port/win/io_win.cc @@ -9,11 +9,10 @@ #include "port/win/io_win.h" -#include "util/sync_point.h" -#include "util/coding.h" -#include "util/iostats_context_imp.h" +#include "monitoring/iostats_context_imp.h" #include "util/aligned_buffer.h" - +#include "util/coding.h" +#include "util/sync_point.h" namespace rocksdb { namespace port { diff --git a/port/win/win_logger.cc b/port/win/win_logger.cc index 3d1d94b63c..41dc0a0ec9 100644 --- a/port/win/win_logger.cc +++ b/port/win/win_logger.cc @@ -21,8 +21,8 @@ #include "rocksdb/env.h" +#include "monitoring/iostats_context_imp.h" #include "port/sys_time.h" -#include "util/iostats_context_imp.h" namespace rocksdb { diff --git a/src.mk b/src.mk index e7f49e3650..f6fb301b25 100644 --- a/src.mk +++ b/src.mk @@ -1,5 +1,8 @@ # These are the sources from which librocksdb.a is built: LIB_SOURCES = \ + cache/clock_cache.cc \ + cache/lru_cache.cc \ + cache/sharded_cache.cc \ db/builder.cc \ db/c.cc \ db/column_family.cc \ @@ -9,22 +12,21 @@ LIB_SOURCES = \ db/compaction_job.cc \ db/compaction_picker.cc \ db/convenience.cc \ - db/range_del_aggregator.cc \ db/db_filesnapshot.cc \ - db/dbformat.cc \ db/db_impl.cc \ db/db_impl_write.cc \ db/db_impl_compaction_flush.cc \ db/db_impl_files.cc \ db/db_impl_open.cc \ db/db_impl_debug.cc \ - db/db_impl_readonly.cc \ db/db_impl_experimental.cc \ + db/db_impl_readonly.cc \ db/db_info_dumper.cc \ db/db_iter.cc \ - db/external_sst_file_ingestion_job.cc \ - db/experimental.cc \ + db/dbformat.cc \ db/event_helpers.cc \ + db/experimental.cc \ + db/external_sst_file_ingestion_job.cc \ db/file_indexer.cc \ db/flush_job.cc \ db/flush_scheduler.cc \ @@ -33,11 +35,12 @@ LIB_SOURCES = \ db/log_reader.cc \ db/log_writer.cc \ db/managed_iterator.cc \ - db/memtable_allocator.cc \ db/memtable.cc \ + db/memtable_allocator.cc \ db/memtable_list.cc \ db/merge_helper.cc \ db/merge_operator.cc \ + db/range_del_aggregator.cc \ db/repair.cc \ db/snapshot_impl.cc \ db/table_cache.cc \ @@ -51,20 +54,44 @@ LIB_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/env_posix.cc \ + env/io_posix.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 \ - port/stack_trace.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_updater_debug.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/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.cc \ table/block_prefix_index.cc \ table/bloom_block.cc \ table/cuckoo_table_builder.cc \ @@ -78,14 +105,14 @@ LIB_SOURCES = \ table/iterator.cc \ table/merging_iterator.cc \ table/meta_blocks.cc \ - table/sst_file_writer.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/dump/db_dump_tool.cc \ @@ -93,101 +120,74 @@ LIB_SOURCES = \ util/auto_roll_logger.cc \ util/bloom.cc \ util/build_version.cc \ - util/cf_options.cc \ - util/clock_cache.cc \ util/coding.cc \ - util/comparator.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/env_posix.cc \ util/event_logger.cc \ - util/file_util.cc \ util/file_reader_writer.cc \ + util/file_util.cc \ util/filename.cc \ util/filter_policy.cc \ util/hash.cc \ - util/histogram.cc \ - util/histogram_windowing.cc \ - util/instrumented_mutex.cc \ - util/iostats_context.cc \ - util/io_posix.cc \ util/log_buffer.cc \ util/logging.cc \ - util/lru_cache.cc \ - util/memenv.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/sst_file_manager_impl.cc \ - util/statistics.cc \ util/status.cc \ util/status_message.cc \ util/string_util.cc \ util/sync_point.cc \ util/thread_local.cc \ - util/thread_status_impl.cc \ - util/thread_status_updater.cc \ - util/thread_status_updater_debug.cc \ - util/thread_status_util.cc \ - util/thread_status_util_debug.cc \ util/threadpool_imp.cc \ util/transaction_test_util.cc \ util/xxhash.cc \ utilities/backupable/backupable_db.cc \ utilities/blob_db/blob_db.cc \ - utilities/convenience/info_log_finder.cc \ utilities/checkpoint/checkpoint.cc \ utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc \ + utilities/convenience/info_log_finder.cc \ + utilities/date_tiered/date_tiered_db_impl.cc \ utilities/document/document_db.cc \ - utilities/document/json_document_builder.cc \ utilities/document/json_document.cc \ + utilities/document/json_document_builder.cc \ utilities/env_mirror.cc \ utilities/env_timed.cc \ utilities/geodb/geodb_impl.cc \ utilities/leveldb_options/leveldb_options.cc \ utilities/lua/rocks_lua_compaction_filter.cc \ utilities/memory/memory_util.cc \ - utilities/merge_operators/put.cc \ utilities/merge_operators/max.cc \ - utilities/merge_operators/string_append/stringappend2.cc \ + utilities/merge_operators/put.cc \ utilities/merge_operators/string_append/stringappend.cc \ + utilities/merge_operators/string_append/stringappend2.cc \ utilities/merge_operators/uint64add.cc \ utilities/option_change_migration/option_change_migration.cc \ utilities/options/options_util.cc \ - utilities/persistent_cache/persistent_cache_tier.cc \ - utilities/persistent_cache/volatile_tier_impl.cc \ + utilities/persistent_cache/block_cache_tier.cc \ utilities/persistent_cache/block_cache_tier_file.cc \ utilities/persistent_cache/block_cache_tier_metadata.cc \ - utilities/persistent_cache/block_cache_tier.cc \ + utilities/persistent_cache/persistent_cache_tier.cc \ + utilities/persistent_cache/volatile_tier_impl.cc \ utilities/redis/redis_lists.cc \ 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_db_impl.cc \ utilities/transactions/transaction_db_mutex_impl.cc \ - utilities/transactions/transaction_lock_mgr.cc \ utilities/transactions/transaction_impl.cc \ + utilities/transactions/transaction_lock_mgr.cc \ utilities/transactions/transaction_util.cc \ utilities/ttl/db_ttl_impl.cc \ - utilities/date_tiered/date_tiered_db_impl.cc \ utilities/write_batch_with_index/write_batch_with_index.cc \ utilities/write_batch_with_index/write_batch_with_index_internal.cc \ @@ -197,8 +197,8 @@ TOOL_LIB_SOURCES = \ tools/sst_dump_tool.cc \ MOCK_LIB_SOURCES = \ + env/mock_env.cc \ table/mock_table.cc \ - util/mock_env.cc \ util/fault_injection_test_env.cc BENCH_LIB_SOURCES = \ @@ -215,26 +215,25 @@ TEST_LIB_SOURCES = \ db/db_test_util.cc MAIN_SOURCES = \ - third-party/gtest-1.7.0/fused-src/gtest/gtest-all.cc \ + cache/cache_bench.cc \ + cache/cache_test.cc \ db/column_family_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/dbformat_test.cc \ db/db_basic_test.cc \ - db/db_iter_test.cc \ - db/db_test.cc \ db/db_block_cache_test.cc \ - db/db_io_failure_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 \ @@ -242,13 +241,15 @@ MAIN_SOURCES = \ db/db_options_test.cc \ db/db_range_del_test.cc \ db/db_sst_test.cc \ - db/external_sst_file_test.cc \ - db/external_sst_file_basic_test.cc \ + db/db_table_properties_test.cc \ db/db_tailing_iter_test.cc \ + db/db_test.cc \ db/db_universal_compaction_test.cc \ db/db_wal_test.cc \ - db/db_table_properties_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 \ @@ -270,8 +271,15 @@ MAIN_SOURCES = \ db/version_set_test.cc \ db/wal_manager_test.cc \ db/write_batch_test.cc \ - db/write_controller_test.cc \ db/write_callback_test.cc \ + db/write_controller_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_test.cc \ table/block_based_filter_block_test.cc \ table/block_test.cc \ table/cuckoo_table_builder_test.cc \ @@ -280,6 +288,7 @@ MAIN_SOURCES = \ table/merger_test.cc \ table/table_reader_bench.cc \ table/table_test.cc \ + third-party/gtest-1.7.0/fused-src/gtest/gtest-all.cc \ tools/db_bench.cc \ tools/db_bench_tool_test.cc \ tools/db_sanity_test.cc \ @@ -290,25 +299,29 @@ MAIN_SOURCES = \ util/auto_roll_logger_test.cc \ util/autovector_test.cc \ util/bloom_test.cc \ - util/cache_bench.cc \ - util/cache_test.cc \ util/coding_test.cc \ util/crc32c_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/histogram_test.cc \ - util/statistics_test.cc \ + util/log_write_bench.cc \ + util/rate_limiter_test.cc \ + util/slice_transform_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_exp.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/redis/redis_lists_test.cc \ @@ -318,20 +331,7 @@ MAIN_SOURCES = \ utilities/transactions/optimistic_transaction_test.cc \ utilities/transactions/transaction_test.cc \ utilities/ttl/ttl_test.cc \ - utilities/date_tiered/date_tiered_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 \ - util/iostats_context_test.cc \ - util/log_write_bench.cc \ - util/mock_env_test.cc \ - util/options_test.cc \ - util/event_logger_test.cc \ - util/rate_limiter_test.cc \ - util/slice_transform_test.cc \ - util/thread_list_test.cc \ - util/thread_local_test.cc \ - utilities/column_aware_encoding_exp.cc JNI_NATIVE_SOURCES = \ java/rocksjni/backupenginejni.cc \ diff --git a/table/block.cc b/table/block.cc index 4bc0add86e..70cf60403f 100644 --- a/table/block.cc +++ b/table/block.cc @@ -15,6 +15,7 @@ #include #include +#include "monitoring/perf_context_imp.h" #include "port/port.h" #include "port/stack_trace.h" #include "rocksdb/comparator.h" @@ -22,7 +23,6 @@ #include "table/format.h" #include "util/coding.h" #include "util/logging.h" -#include "util/perf_context_imp.h" namespace rocksdb { diff --git a/table/block_based_filter_block.cc b/table/block_based_filter_block.cc index 343ac9aac1..2f8d994660 100644 --- a/table/block_based_filter_block.cc +++ b/table/block_based_filter_block.cc @@ -11,9 +11,9 @@ #include #include "db/dbformat.h" +#include "monitoring/perf_context_imp.h" #include "rocksdb/filter_policy.h" #include "util/coding.h" -#include "util/perf_context_imp.h" #include "util/string_util.h" namespace rocksdb { diff --git a/table/block_based_table_reader.cc b/table/block_based_table_reader.cc index d9a6c18a6a..75d2720684 100644 --- a/table/block_based_table_reader.cc +++ b/table/block_based_table_reader.cc @@ -42,9 +42,9 @@ #include "table/sst_file_writer_collectors.h" #include "table/two_level_iterator.h" +#include "monitoring/perf_context_imp.h" #include "util/coding.h" #include "util/file_reader_writer.h" -#include "util/perf_context_imp.h" #include "util/stop_watch.h" #include "util/string_util.h" #include "util/sync_point.h" diff --git a/table/block_based_table_reader.h b/table/block_based_table_reader.h index 0305f20767..47c40f3f4a 100644 --- a/table/block_based_table_reader.h +++ b/table/block_based_table_reader.h @@ -16,6 +16,7 @@ #include #include +#include "options/cf_options.h" #include "rocksdb/options.h" #include "rocksdb/persistent_cache.h" #include "rocksdb/statistics.h" @@ -27,7 +28,6 @@ #include "table/table_properties_internal.h" #include "table/table_reader.h" #include "table/two_level_iterator.h" -#include "util/cf_options.h" #include "util/coding.h" #include "util/file_reader_writer.h" diff --git a/table/cuckoo_table_reader.h b/table/cuckoo_table_reader.h index 7bfc72a0bf..37e7f63604 100644 --- a/table/cuckoo_table_reader.h +++ b/table/cuckoo_table_reader.h @@ -15,10 +15,10 @@ #include #include "db/dbformat.h" +#include "options/cf_options.h" #include "rocksdb/env.h" #include "rocksdb/options.h" #include "table/table_reader.h" -#include "util/cf_options.h" #include "util/file_reader_writer.h" namespace rocksdb { diff --git a/table/format.cc b/table/format.cc index 08c24b80b7..2d03316b4f 100644 --- a/table/format.cc +++ b/table/format.cc @@ -12,6 +12,8 @@ #include #include +#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" @@ -21,8 +23,6 @@ #include "util/crc32c.h" #include "util/file_reader_writer.h" #include "util/logging.h" -#include "util/perf_context_imp.h" -#include "util/statistics.h" #include "util/stop_watch.h" #include "util/string_util.h" #include "util/xxhash.h" diff --git a/table/format.h b/table/format.h index f8c8c027e4..2ebbd666f2 100644 --- a/table/format.h +++ b/table/format.h @@ -15,9 +15,9 @@ #include "rocksdb/options.h" #include "rocksdb/table.h" +#include "options/cf_options.h" #include "port/port.h" // noexcept #include "table/persistent_cache_options.h" -#include "util/cf_options.h" namespace rocksdb { diff --git a/table/full_filter_block.cc b/table/full_filter_block.cc index 267057915f..5606658c31 100644 --- a/table/full_filter_block.cc +++ b/table/full_filter_block.cc @@ -5,10 +5,10 @@ #include "table/full_filter_block.h" -#include "rocksdb/filter_policy.h" +#include "monitoring/perf_context_imp.h" #include "port/port.h" +#include "rocksdb/filter_policy.h" #include "util/coding.h" -#include "util/perf_context_imp.h" namespace rocksdb { diff --git a/table/get_context.cc b/table/get_context.cc index 4b517a50b1..526d8053ba 100644 --- a/table/get_context.cc +++ b/table/get_context.cc @@ -6,11 +6,11 @@ #include "table/get_context.h" #include "db/merge_helper.h" #include "db/pinned_iterators_manager.h" +#include "monitoring/perf_context_imp.h" +#include "monitoring/statistics.h" #include "rocksdb/env.h" #include "rocksdb/merge_operator.h" #include "rocksdb/statistics.h" -#include "util/perf_context_imp.h" -#include "util/statistics.h" namespace rocksdb { diff --git a/table/merging_iterator.cc b/table/merging_iterator.cc index 5a56fbf669..4d02231d21 100644 --- a/table/merging_iterator.cc +++ b/table/merging_iterator.cc @@ -11,6 +11,7 @@ #include #include #include "db/pinned_iterators_manager.h" +#include "monitoring/perf_context_imp.h" #include "rocksdb/comparator.h" #include "rocksdb/iterator.h" #include "rocksdb/options.h" @@ -20,7 +21,6 @@ #include "util/arena.h" #include "util/autovector.h" #include "util/heap.h" -#include "util/perf_context_imp.h" #include "util/stop_watch.h" #include "util/sync_point.h" diff --git a/table/persistent_cache_helper.h b/table/persistent_cache_helper.h index 7733b3faca..cccf1af1d7 100644 --- a/table/persistent_cache_helper.h +++ b/table/persistent_cache_helper.h @@ -6,9 +6,9 @@ #include +#include "monitoring/statistics.h" #include "table/format.h" #include "table/persistent_cache_options.h" -#include "util/statistics.h" namespace rocksdb { diff --git a/table/persistent_cache_options.h b/table/persistent_cache_options.h index f05f4805c3..f7eb436802 100644 --- a/table/persistent_cache_options.h +++ b/table/persistent_cache_options.h @@ -6,8 +6,8 @@ #include +#include "monitoring/statistics.h" #include "rocksdb/persistent_cache.h" -#include "util/statistics.h" namespace rocksdb { diff --git a/table/plain_table_index.h b/table/plain_table_index.h index c75abc86a2..34e3448505 100644 --- a/table/plain_table_index.h +++ b/table/plain_table_index.h @@ -11,11 +11,11 @@ #include #include "db/dbformat.h" +#include "monitoring/histogram.h" +#include "options/cf_options.h" #include "rocksdb/options.h" #include "util/arena.h" -#include "util/cf_options.h" #include "util/hash.h" -#include "util/histogram.h" #include "util/murmurhash.h" namespace rocksdb { diff --git a/table/plain_table_reader.cc b/table/plain_table_reader.cc index cac59bd059..48c3cd1801 100644 --- a/table/plain_table_reader.cc +++ b/table/plain_table_reader.cc @@ -29,17 +29,16 @@ #include "table/plain_table_key_coding.h" #include "table/get_context.h" +#include "monitoring/histogram.h" +#include "monitoring/perf_context_imp.h" #include "util/arena.h" #include "util/coding.h" #include "util/dynamic_bloom.h" #include "util/hash.h" -#include "util/histogram.h" #include "util/murmurhash.h" -#include "util/perf_context_imp.h" #include "util/stop_watch.h" #include "util/string_util.h" - namespace rocksdb { namespace { diff --git a/table/table_builder.h b/table/table_builder.h index 2b421657ff..035d368085 100644 --- a/table/table_builder.h +++ b/table/table_builder.h @@ -14,9 +14,9 @@ #include #include #include "db/table_properties_collector.h" +#include "options/cf_options.h" #include "rocksdb/options.h" #include "rocksdb/table_properties.h" -#include "util/cf_options.h" #include "util/file_reader_writer.h" namespace rocksdb { diff --git a/table/table_reader_bench.cc b/table/table_reader_bench.cc index 7984cdb1f1..9620a91c74 100644 --- a/table/table_reader_bench.cc +++ b/table/table_reader_bench.cc @@ -13,18 +13,18 @@ int main() { #include +#include "db/db_impl.h" +#include "db/dbformat.h" +#include "monitoring/histogram.h" #include "rocksdb/db.h" #include "rocksdb/slice_transform.h" #include "rocksdb/table.h" -#include "db/db_impl.h" -#include "db/dbformat.h" #include "table/block_based_table_factory.h" +#include "table/get_context.h" #include "table/internal_iterator.h" #include "table/plain_table_factory.h" #include "table/table_builder.h" -#include "table/get_context.h" #include "util/file_reader_writer.h" -#include "util/histogram.h" #include "util/testharness.h" #include "util/testutil.h" diff --git a/table/table_test.cc b/table/table_test.cc index dc8c59ab02..20642a9a5f 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -21,6 +21,7 @@ #include "db/memtable.h" #include "db/write_batch_internal.h" #include "memtable/stl_wrappers.h" +#include "monitoring/statistics.h" #include "port/port.h" #include "rocksdb/cache.h" #include "rocksdb/db.h" @@ -45,7 +46,6 @@ #include "table/sst_file_writer_collectors.h" #include "util/compression.h" #include "util/random.h" -#include "util/statistics.h" #include "util/string_util.h" #include "util/sync_point.h" #include "util/testharness.h" diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc index 8b55766c16..f2f9147503 100644 --- a/tools/db_bench_tool.cc +++ b/tools/db_bench_tool.cc @@ -35,6 +35,8 @@ #include "db/db_impl.h" #include "db/version_set.h" #include "hdfs/env_hdfs.h" +#include "monitoring/histogram.h" +#include "monitoring/statistics.h" #include "port/port.h" #include "port/stack_trace.h" #include "rocksdb/cache.h" @@ -57,10 +59,8 @@ #include "rocksdb/write_batch.h" #include "util/compression.h" #include "util/crc32c.h" -#include "util/histogram.h" #include "util/mutexlock.h" #include "util/random.h" -#include "util/statistics.h" #include "util/stderr_logger.h" #include "util/string_util.h" #include "util/testutil.h" diff --git a/tools/db_bench_tool_test.cc b/tools/db_bench_tool_test.cc index eae1e82a7f..87de28290d 100644 --- a/tools/db_bench_tool_test.cc +++ b/tools/db_bench_tool_test.cc @@ -8,8 +8,8 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "rocksdb/db_bench_tool.h" +#include "options/options_parser.h" #include "rocksdb/utilities/options_util.h" -#include "util/options_parser.h" #include "util/random.h" #include "util/testharness.h" #include "util/testutil.h" diff --git a/tools/db_stress.cc b/tools/db_stress.cc index 9215fe0369..4e8ea7e4a3 100644 --- a/tools/db_stress.cc +++ b/tools/db_stress.cc @@ -42,6 +42,7 @@ int main() { #include "db/db_impl.h" #include "db/version_set.h" #include "hdfs/env_hdfs.h" +#include "monitoring/histogram.h" #include "port/port.h" #include "rocksdb/cache.h" #include "rocksdb/env.h" @@ -53,7 +54,6 @@ int main() { #include "util/coding.h" #include "util/compression.h" #include "util/crc32c.h" -#include "util/histogram.h" #include "util/logging.h" #include "util/mutexlock.h" #include "util/random.h" diff --git a/tools/sst_dump_tool.cc b/tools/sst_dump_tool.cc index eea61af954..15ae594080 100644 --- a/tools/sst_dump_tool.cc +++ b/tools/sst_dump_tool.cc @@ -19,6 +19,7 @@ #include "db/memtable.h" #include "db/write_batch_internal.h" +#include "options/cf_options.h" #include "rocksdb/db.h" #include "rocksdb/env.h" #include "rocksdb/iterator.h" @@ -34,7 +35,6 @@ #include "table/meta_blocks.h" #include "table/plain_table_factory.h" #include "table/table_reader.h" -#include "util/cf_options.h" #include "util/compression.h" #include "util/random.h" diff --git a/tools/sst_dump_tool_imp.h b/tools/sst_dump_tool_imp.h index f0ef04a809..0511472508 100644 --- a/tools/sst_dump_tool_imp.h +++ b/tools/sst_dump_tool_imp.h @@ -10,7 +10,7 @@ #include #include #include "db/dbformat.h" -#include "util/cf_options.h" +#include "options/cf_options.h" #include "util/file_reader_writer.h" namespace rocksdb { diff --git a/util/delete_scheduler.h b/util/delete_scheduler.h index 678bf5c177..19de000961 100644 --- a/util/delete_scheduler.h +++ b/util/delete_scheduler.h @@ -12,8 +12,8 @@ #include #include +#include "monitoring/instrumented_mutex.h" #include "port/port.h" -#include "util/instrumented_mutex.h" #include "rocksdb/status.h" diff --git a/util/fault_injection_test_env.h b/util/fault_injection_test_env.h index 889f93ea17..eb0568e73d 100644 --- a/util/fault_injection_test_env.h +++ b/util/fault_injection_test_env.h @@ -19,10 +19,10 @@ #include #include "db/version_set.h" +#include "env/mock_env.h" #include "rocksdb/db.h" #include "rocksdb/env.h" #include "util/filename.h" -#include "util/mock_env.h" #include "util/mutexlock.h" namespace rocksdb { diff --git a/util/file_reader_writer.cc b/util/file_reader_writer.cc index 5e8e8d6312..94812d2b83 100644 --- a/util/file_reader_writer.cc +++ b/util/file_reader_writer.cc @@ -12,9 +12,9 @@ #include #include +#include "monitoring/histogram.h" +#include "monitoring/iostats_context_imp.h" #include "port/port.h" -#include "util/histogram.h" -#include "util/iostats_context_imp.h" #include "util/random.h" #include "util/rate_limiter.h" #include "util/sync_point.h" diff --git a/util/file_util.h b/util/file_util.h index 56c78742c9..6eddc589bc 100644 --- a/util/file_util.h +++ b/util/file_util.h @@ -6,10 +6,10 @@ #pragma once #include +#include "options/db_options.h" #include "rocksdb/env.h" #include "rocksdb/status.h" #include "rocksdb/types.h" -#include "util/db_options.h" namespace rocksdb { // use_fsync maps to options.use_fsync, which determines the way that diff --git a/util/filename.h b/util/filename.h index 5b6f727ad4..e488932660 100644 --- a/util/filename.h +++ b/util/filename.h @@ -15,12 +15,12 @@ #include #include +#include "options/db_options.h" #include "port/port.h" #include "rocksdb/options.h" #include "rocksdb/slice.h" #include "rocksdb/status.h" #include "rocksdb/transaction_log.h" -#include "util/db_options.h" namespace rocksdb { diff --git a/util/log_write_bench.cc b/util/log_write_bench.cc index 10566d2e7a..9ba84b7c69 100644 --- a/util/log_write_bench.cc +++ b/util/log_write_bench.cc @@ -13,9 +13,9 @@ int main() { #include +#include "monitoring/histogram.h" #include "rocksdb/env.h" #include "util/file_reader_writer.h" -#include "util/histogram.h" #include "util/testharness.h" #include "util/testutil.h" diff --git a/util/rate_limiter.cc b/util/rate_limiter.cc index d3b512e421..0c38ebb109 100644 --- a/util/rate_limiter.cc +++ b/util/rate_limiter.cc @@ -8,9 +8,9 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "util/rate_limiter.h" +#include "monitoring/statistics.h" #include "port/port.h" #include "rocksdb/env.h" -#include "util/statistics.h" #include "util/sync_point.h" namespace rocksdb { diff --git a/util/stop_watch.h b/util/stop_watch.h index de1772809d..6f1f20ef71 100644 --- a/util/stop_watch.h +++ b/util/stop_watch.h @@ -4,8 +4,8 @@ // of patent rights can be found in the PATENTS file in the same directory. // #pragma once +#include "monitoring/statistics.h" #include "rocksdb/env.h" -#include "util/statistics.h" namespace rocksdb { // Auto-scoped. diff --git a/util/thread_list_test.cc b/util/thread_list_test.cc index f09197cb6f..c13c063b8d 100644 --- a/util/thread_list_test.cc +++ b/util/thread_list_test.cc @@ -6,9 +6,9 @@ #include #include -#include "util/thread_status_updater.h" -#include "util/testharness.h" +#include "monitoring/thread_status_updater.h" #include "rocksdb/db.h" +#include "util/testharness.h" #ifdef ROCKSDB_USING_THREAD_STATUS diff --git a/util/threadpool_imp.cc b/util/threadpool_imp.cc index 19e9757888..dc73e134f3 100644 --- a/util/threadpool_imp.cc +++ b/util/threadpool_imp.cc @@ -9,8 +9,8 @@ #include "util/threadpool_imp.h" +#include "monitoring/thread_status_util.h" #include "port/port.h" -#include "util/thread_status_util.h" #ifndef OS_WIN # include diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc index 14404db239..6eb99790be 100644 --- a/utilities/backupable/backupable_db_test.cc +++ b/utilities/backupable/backupable_db_test.cc @@ -13,6 +13,7 @@ #include #include "db/db_impl.h" +#include "env/env_chroot.h" #include "port/port.h" #include "port/stack_trace.h" #include "rocksdb/rate_limiter.h" @@ -20,7 +21,6 @@ #include "rocksdb/types.h" #include "rocksdb/utilities/backupable_db.h" #include "rocksdb/utilities/options_util.h" -#include "util/env_chroot.h" #include "util/file_reader_writer.h" #include "util/filename.h" #include "util/mutexlock.h" diff --git a/utilities/blob_db/blob_db.cc b/utilities/blob_db/blob_db.cc index 1ea94814df..dcc9b5e3f8 100644 --- a/utilities/blob_db/blob_db.cc +++ b/utilities/blob_db/blob_db.cc @@ -5,6 +5,8 @@ #ifndef ROCKSDB_LITE #include "db/write_batch_internal.h" +#include "monitoring/instrumented_mutex.h" +#include "options/cf_options.h" #include "rocksdb/convenience.h" #include "rocksdb/env.h" #include "rocksdb/iterator.h" @@ -12,11 +14,9 @@ #include "table/block.h" #include "table/block_based_table_builder.h" #include "table/block_builder.h" -#include "util/cf_options.h" #include "util/crc32c.h" #include "util/file_reader_writer.h" #include "util/filename.h" -#include "util/instrumented_mutex.h" namespace rocksdb { diff --git a/utilities/column_aware_encoding_util.h b/utilities/column_aware_encoding_util.h index 0ee0a2634a..ea3d941a3a 100644 --- a/utilities/column_aware_encoding_util.h +++ b/utilities/column_aware_encoding_util.h @@ -12,8 +12,8 @@ #include "include/rocksdb/listener.h" #include "include/rocksdb/options.h" #include "include/rocksdb/status.h" +#include "options/cf_options.h" #include "table/block_based_table_reader.h" -#include "util/cf_options.h" namespace rocksdb { diff --git a/utilities/date_tiered/date_tiered_db_impl.cc b/utilities/date_tiered/date_tiered_db_impl.cc index d0e2d52347..b02357b0fc 100644 --- a/utilities/date_tiered/date_tiered_db_impl.cc +++ b/utilities/date_tiered/date_tiered_db_impl.cc @@ -10,6 +10,8 @@ #include "db/db_impl.h" #include "db/db_iter.h" #include "db/write_batch_internal.h" +#include "monitoring/instrumented_mutex.h" +#include "options/options_helper.h" #include "rocksdb/convenience.h" #include "rocksdb/env.h" #include "rocksdb/iterator.h" @@ -17,8 +19,6 @@ #include "table/merging_iterator.h" #include "util/coding.h" #include "util/filename.h" -#include "util/instrumented_mutex.h" -#include "util/options_helper.h" #include "util/string_util.h" namespace rocksdb { diff --git a/utilities/date_tiered/date_tiered_db_impl.h b/utilities/date_tiered/date_tiered_db_impl.h index bce5feefb9..3a4bef8b70 100644 --- a/utilities/date_tiered/date_tiered_db_impl.h +++ b/utilities/date_tiered/date_tiered_db_impl.h @@ -10,10 +10,10 @@ #include #include +#include "monitoring/instrumented_mutex.h" +#include "options/cf_options.h" #include "rocksdb/db.h" #include "rocksdb/utilities/date_tiered_db.h" -#include "util/cf_options.h" -#include "util/instrumented_mutex.h" namespace rocksdb { diff --git a/utilities/env_librados_test.cc b/utilities/env_librados_test.cc index 9535401c4a..4ebd512e35 100644 --- a/utilities/env_librados_test.cc +++ b/utilities/env_librados_test.cc @@ -5,9 +5,9 @@ #ifndef ROCKSDB_LITE -#include #include "rocksdb/utilities/env_librados.h" -#include "util/mock_env.h" +#include +#include "env/mock_env.h" #include "util/testharness.h" #include "rocksdb/db.h" diff --git a/utilities/env_mirror_test.cc b/utilities/env_mirror_test.cc index 845356bf6d..d99eb5eab2 100644 --- a/utilities/env_mirror_test.cc +++ b/utilities/env_mirror_test.cc @@ -6,7 +6,7 @@ #ifndef ROCKSDB_LITE #include "rocksdb/utilities/env_mirror.h" -#include "util/mock_env.h" +#include "env/mock_env.h" #include "util/testharness.h" namespace rocksdb { diff --git a/utilities/env_timed.cc b/utilities/env_timed.cc index fc4fe37140..4a222547ef 100644 --- a/utilities/env_timed.cc +++ b/utilities/env_timed.cc @@ -3,9 +3,9 @@ // 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 "monitoring/perf_context_imp.h" #include "rocksdb/env.h" #include "rocksdb/status.h" -#include "util/perf_context_imp.h" namespace rocksdb { diff --git a/utilities/options/options_util.cc b/utilities/options/options_util.cc index babfcd6595..aec47c2f4b 100644 --- a/utilities/options/options_util.cc +++ b/utilities/options/options_util.cc @@ -7,9 +7,9 @@ #include "rocksdb/utilities/options_util.h" +#include "options/options_parser.h" #include "rocksdb/options.h" #include "util/filename.h" -#include "util/options_parser.h" namespace rocksdb { Status LoadOptionsFromFile(const std::string& file_name, Env* env, diff --git a/utilities/options/options_util_test.cc b/utilities/options/options_util_test.cc index 0873071eee..c538262e97 100644 --- a/utilities/options/options_util_test.cc +++ b/utilities/options/options_util_test.cc @@ -13,10 +13,10 @@ #include #include +#include "options/options_parser.h" #include "rocksdb/db.h" #include "rocksdb/table.h" #include "rocksdb/utilities/options_util.h" -#include "util/options_parser.h" #include "util/random.h" #include "util/testharness.h" #include "util/testutil.h" diff --git a/utilities/persistent_cache/block_cache_tier.h b/utilities/persistent_cache/block_cache_tier.h index 490a85f817..246a5b893a 100644 --- a/utilities/persistent_cache/block_cache_tier.h +++ b/utilities/persistent_cache/block_cache_tier.h @@ -27,11 +27,11 @@ #include "utilities/persistent_cache/persistent_cache_util.h" #include "db/skiplist.h" +#include "monitoring/histogram.h" #include "port/port.h" #include "util/arena.h" #include "util/coding.h" #include "util/crc32c.h" -#include "util/histogram.h" #include "util/mutexlock.h" namespace rocksdb { diff --git a/utilities/persistent_cache/persistent_cache_bench.cc b/utilities/persistent_cache/persistent_cache_bench.cc index 866eb18c48..112b26555c 100644 --- a/utilities/persistent_cache/persistent_cache_bench.cc +++ b/utilities/persistent_cache/persistent_cache_bench.cc @@ -17,9 +17,9 @@ #include "utilities/persistent_cache/persistent_cache_tier.h" #include "utilities/persistent_cache/volatile_tier_impl.h" +#include "monitoring/histogram.h" #include "port/port.h" #include "table/block_builder.h" -#include "util/histogram.h" #include "util/mutexlock.h" #include "util/stop_watch.h" diff --git a/utilities/persistent_cache/persistent_cache_tier.h b/utilities/persistent_cache/persistent_cache_tier.h index 0adfcf1235..d6b25a31e0 100644 --- a/utilities/persistent_cache/persistent_cache_tier.h +++ b/utilities/persistent_cache/persistent_cache_tier.h @@ -13,10 +13,10 @@ #include #include +#include "monitoring/histogram.h" #include "rocksdb/env.h" #include "rocksdb/persistent_cache.h" #include "rocksdb/status.h" -#include "util/histogram.h" // Persistent Cache // diff --git a/utilities/simulator_cache/sim_cache.cc b/utilities/simulator_cache/sim_cache.cc index 0e97a6aa29..2a41ad7dc7 100644 --- a/utilities/simulator_cache/sim_cache.cc +++ b/utilities/simulator_cache/sim_cache.cc @@ -5,8 +5,8 @@ #include "rocksdb/utilities/sim_cache.h" #include +#include "monitoring/statistics.h" #include "port/port.h" -#include "util/statistics.h" namespace rocksdb { diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index 1bfee89a90..1373c08956 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -12,10 +12,10 @@ #include #include +#include "monitoring/instrumented_mutex.h" #include "rocksdb/utilities/transaction.h" #include "util/autovector.h" #include "util/hash_map.h" -#include "util/instrumented_mutex.h" #include "util/thread_local.h" #include "utilities/transactions/transaction_impl.h" diff --git a/utilities/write_batch_with_index/write_batch_with_index.cc b/utilities/write_batch_with_index/write_batch_with_index.cc index c92735faca..cfceaeeeea 100644 --- a/utilities/write_batch_with_index/write_batch_with_index.cc +++ b/utilities/write_batch_with_index/write_batch_with_index.cc @@ -15,10 +15,10 @@ #include "db/merge_context.h" #include "db/merge_helper.h" #include "db/skiplist.h" +#include "options/db_options.h" #include "rocksdb/comparator.h" #include "rocksdb/iterator.h" #include "util/arena.h" -#include "util/db_options.h" #include "utilities/write_batch_with_index/write_batch_with_index_internal.h" namespace rocksdb { diff --git a/utilities/write_batch_with_index/write_batch_with_index_internal.h b/utilities/write_batch_with_index/write_batch_with_index_internal.h index 7279cde92b..069d3655c5 100644 --- a/utilities/write_batch_with_index/write_batch_with_index_internal.h +++ b/utilities/write_batch_with_index/write_batch_with_index_internal.h @@ -10,13 +10,13 @@ #include #include +#include "options/db_options.h" #include "port/port.h" #include "rocksdb/comparator.h" #include "rocksdb/iterator.h" #include "rocksdb/slice.h" #include "rocksdb/status.h" #include "rocksdb/utilities/write_batch_with_index.h" -#include "util/db_options.h" namespace rocksdb {