Move some logging related files to logging/ (#5387)

Summary:
Many logging related source files are under util/. It will be more structured if they are together.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5387

Differential Revision: D15579036

Pulled By: siying

fbshipit-source-id: 3850134ed50b8c0bb40a0c8ae1f184fa4081303f

CMakeLists.txt

@@ -549,6 +549,9 @@ set(SOURCES
         file/file_util.cc
         file/filename.cc
         file/sst_file_manager_impl.cc
+        logging/auto_roll_logger.cc
+        logging/event_logger.cc
+        logging/log_buffer.cc
         memory/arena.cc
         memory/concurrent_arena.cc
         memory/jemalloc_nodump_allocator.cc
@@ -620,7 +623,6 @@ set(SOURCES
         tools/ldb_tool.cc
         tools/sst_dump_tool.cc
         tools/trace_analyzer_tool.cc
-        util/auto_roll_logger.cc
         util/bloom.cc
         util/coding.cc
         util/compaction_job_stats_impl.cc
@@ -629,11 +631,9 @@ set(SOURCES
         util/concurrent_task_limiter_impl.cc
         util/crc32c.cc
         util/dynamic_bloom.cc
-        util/event_logger.cc
         util/file_reader_writer.cc
         util/filter_policy.cc
         util/hash.cc
-        util/log_buffer.cc
         util/murmurhash.cc
         util/random.cc
         util/rate_limiter.cc
@@ -939,6 +939,8 @@ if(WITH_TESTS)
         env/env_test.cc
         env/mock_env_test.cc
         file/delete_scheduler_test.cc
+        logging/auto_roll_logger_test.cc
+        logging/event_logger_test.cc
         memory/arena_test.cc
         memtable/inlineskiplist_test.cc
         memtable/skiplist_test.cc
@@ -963,13 +965,11 @@ if(WITH_TESTS)
         tools/reduce_levels_test.cc
         tools/sst_dump_test.cc
         tools/trace_analyzer_test.cc
-        util/auto_roll_logger_test.cc
         util/autovector_test.cc
         util/bloom_test.cc
         util/coding_test.cc
         util/crc32c_test.cc
         util/dynamic_bloom_test.cc
-        util/event_logger_test.cc
         util/file_reader_writer_test.cc
         util/filelock_test.cc
         util/hash_test.cc

Makefile

@@ -1498,7 +1498,7 @@ db_bench_tool_test: tools/db_bench_tool_test.o $(BENCHTOOLOBJECTS) $(TESTHARNESS
 trace_analyzer_test: tools/trace_analyzer_test.o $(LIBOBJECTS) $(ANALYZETOOLOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-event_logger_test: util/event_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
+event_logger_test: logging/event_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 timer_queue_test: util/timer_queue_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1519,7 +1519,7 @@ manual_compaction_test: db/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS)
 filelock_test: util/filelock_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-auto_roll_logger_test: util/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
+auto_roll_logger_test: logging/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 memtable_list_test: db/memtable_list_test.o $(LIBOBJECTS) $(TESTHARNESS)

TARGETS

@@ -148,6 +148,9 @@ cpp_library(
         "file/file_util.cc",
         "file/filename.cc",
         "file/sst_file_manager_impl.cc",
+        "logging/auto_roll_logger.cc",
+        "logging/event_logger.cc",
+        "logging/log_buffer.cc",
         "memory/arena.cc",
         "memory/concurrent_arena.cc",
         "memory/jemalloc_nodump_allocator.cc",
@@ -218,7 +221,6 @@ cpp_library(
         "tools/ldb_cmd.cc",
         "tools/ldb_tool.cc",
         "tools/sst_dump_tool.cc",
-        "util/auto_roll_logger.cc",
         "util/bloom.cc",
         "util/build_version.cc",
         "util/coding.cc",
@@ -228,11 +230,9 @@ cpp_library(
         "util/concurrent_task_limiter_impl.cc",
         "util/crc32c.cc",
         "util/dynamic_bloom.cc",
-        "util/event_logger.cc",
         "util/file_reader_writer.cc",
         "util/filter_policy.cc",
         "util/hash.cc",
-        "util/log_buffer.cc",
         "util/murmurhash.cc",
         "util/random.cc",
         "util/rate_limiter.cc",
@@ -359,7 +359,7 @@ ROCKS_TESTS = [
     ],
     [
         "auto_roll_logger_test",
-        "util/auto_roll_logger_test.cc",
+        "logging/auto_roll_logger_test.cc",
         "serial",
     ],
     [
@@ -699,7 +699,7 @@ ROCKS_TESTS = [
     ],
     [
         "event_logger_test",
-        "util/event_logger_test.cc",
+        "logging/event_logger_test.cc",
         "serial",
     ],
     [

db/builder.h

@@ -11,6 +11,7 @@
 #include <vector>
 #include "db/range_tombstone_fragmenter.h"
 #include "db/table_properties_collector.h"
+#include "logging/event_logger.h"
 #include "options/cf_options.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"
@@ -20,7 +21,6 @@
 #include "rocksdb/table_properties.h"
 #include "rocksdb/types.h"
 #include "table/scoped_arena_iterator.h"
-#include "util/event_logger.h"
 
 namespace rocksdb {
 

db/compaction/compaction_job.cc

@@ -40,6 +40,8 @@
 #include "db/version_set.h"
 #include "file/filename.h"
 #include "file/sst_file_manager_impl.h"
+#include "logging/log_buffer.h"
+#include "logging/logging.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_util.h"
@@ -56,8 +58,6 @@
 #include "test_util/sync_point.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/log_buffer.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
 #include "util/stop_watch.h"

db/compaction/compaction_job.h

@@ -29,6 +29,7 @@
 #include "db/version_edit.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
+#include "logging/event_logger.h"
 #include "options/cf_options.h"
 #include "options/db_options.h"
 #include "port/port.h"
@@ -40,7 +41,6 @@
 #include "rocksdb/transaction_log.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/autovector.h"
-#include "util/event_logger.h"
 #include "util/stop_watch.h"
 #include "util/thread_local.h"
 

db/compaction/compaction_job_stats_test.cc

@@ -28,6 +28,7 @@
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "monitoring/thread_status_util.h"
@@ -57,7 +58,6 @@
 #include "test_util/testutil.h"
 #include "util/compression.h"
 #include "util/hash.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/string_util.h"

db/compaction/compaction_picker.cc

@@ -21,9 +21,9 @@
 #include <vector>
 #include "db/column_family.h"
 #include "file/filename.h"
+#include "logging/log_buffer.h"
 #include "monitoring/statistics.h"
 #include "test_util/sync_point.h"
-#include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"
 

db/compaction/compaction_picker_fifo.cc

@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 #include "db/column_family.h"
-#include "util/log_buffer.h"
+#include "logging/log_buffer.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/compaction/compaction_picker_level.cc

@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "db/compaction/compaction_picker_level.h"
+#include "logging/log_buffer.h"
 #include "test_util/sync_point.h"
-#include "util/log_buffer.h"
 
 namespace rocksdb {
 

db/compaction/compaction_picker_test.cc

@@ -12,9 +12,9 @@
 #include "db/compaction/compaction_picker_level.h"
 #include "db/compaction/compaction_picker_universal.h"
 
+#include "logging/logging.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/logging.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/compaction/compaction_picker_universal.cc

@@ -21,9 +21,9 @@
 #include <utility>
 #include "db/column_family.h"
 #include "file/filename.h"
+#include "logging/log_buffer.h"
 #include "monitoring/statistics.h"
 #include "test_util/sync_point.h"
-#include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"
 

db/db_impl/db_impl.cc

@@ -56,6 +56,9 @@
 #include "file/file_util.h"
 #include "file/filename.h"
 #include "file/sst_file_manager_impl.h"
+#include "logging/auto_roll_logger.h"
+#include "logging/log_buffer.h"
+#include "logging/logging.h"
 #include "memtable/hash_linklist_rep.h"
 #include "memtable/hash_skiplist_rep.h"
 #include "monitoring/iostats_context_imp.h"
@@ -86,15 +89,12 @@
 #include "table/two_level_iterator.h"
 #include "test_util/sync_point.h"
 #include "tools/sst_dump_tool_imp.h"
-#include "util/auto_roll_logger.h"
 #include "util/autovector.h"
 #include "util/build_version.h"
 #include "util/coding.h"
 #include "util/compression.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/log_buffer.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"

db/db_impl/db_impl.h

@@ -40,6 +40,8 @@
 #include "db/wal_manager.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
+#include "db/memtable_list.h"
+#include "logging/event_logger.h"
 #include "monitoring/instrumented_mutex.h"
 #include "options/db_options.h"
 #include "port/port.h"
@@ -52,7 +54,6 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/autovector.h"
-#include "util/event_logger.h"
 #include "util/hash.h"
 #include "util/repeatable_thread.h"
 #include "util/stop_watch.h"

db/db_impl/db_impl_secondary.cc

@@ -12,8 +12,8 @@
 
 #include "db/db_iter.h"
 #include "db/merge_context.h"
+#include "logging/auto_roll_logger.h"
 #include "monitoring/perf_context_imp.h"
-#include "util/auto_roll_logger.h"
 
 namespace rocksdb {
 

db/db_iter.cc

@@ -17,6 +17,7 @@
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "memory/arena.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/env.h"
@@ -25,7 +26,6 @@
 #include "rocksdb/options.h"
 #include "table/internal_iterator.h"
 #include "table/iterator_wrapper.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
 #include "util/trace_replay.h"

db/dbformat.h

@@ -14,6 +14,7 @@
 #include <utility>
 #include "db/lookup_key.h"
 #include "db/merge_context.h"
+#include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
@@ -23,7 +24,6 @@
 #include "rocksdb/table.h"
 #include "rocksdb/types.h"
 #include "util/coding.h"
-#include "util/logging.h"
 #include "util/user_comparator_wrapper.h"
 
 namespace rocksdb {

db/dbformat_test.cc

@@ -8,8 +8,8 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "db/dbformat.h"
+#include "logging/logging.h"
 #include "test_util/testharness.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

db/event_helpers.h

@@ -10,9 +10,9 @@
 
 #include "db/column_family.h"
 #include "db/version_edit.h"
+#include "logging/event_logger.h"
 #include "rocksdb/listener.h"
 #include "rocksdb/table_properties.h"
-#include "util/event_logger.h"
 
 namespace rocksdb {
 

db/fault_injection_test.cc

@@ -16,6 +16,7 @@
 #include "db/version_set.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
@@ -25,7 +26,6 @@
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 
 namespace rocksdb {

db/filename_test.cc

@@ -10,9 +10,9 @@
 #include "file/filename.h"
 
 #include "db/dbformat.h"
+#include "logging/logging.h"
 #include "port/port.h"
 #include "test_util/testharness.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

db/flush_job.cc

@@ -31,6 +31,9 @@
 #include "db/version_set.h"
 #include "file/file_util.h"
 #include "file/filename.h"
+#include "logging/event_logger.h"
+#include "logging/log_buffer.h"
+#include "logging/logging.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_util.h"
@@ -47,9 +50,6 @@
 #include "table/two_level_iterator.h"
 #include "test_util/sync_point.h"
 #include "util/coding.h"
-#include "util/event_logger.h"
-#include "util/log_buffer.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
 

db/flush_job.h

@@ -28,6 +28,7 @@
 #include "db/version_edit.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
+#include "logging/event_logger.h"
 #include "monitoring/instrumented_mutex.h"
 #include "options/db_options.h"
 #include "port/port.h"
@@ -37,7 +38,6 @@
 #include "rocksdb/transaction_log.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/autovector.h"
-#include "util/event_logger.h"
 #include "util/stop_watch.h"
 #include "util/thread_local.h"
 

db/listener_test.cc

@@ -9,6 +9,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/cache.h"
@@ -28,7 +29,6 @@
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/hash.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/string_util.h"

db/memtable_list.cc

@@ -17,6 +17,7 @@
 #include "db/memtable.h"
 #include "db/range_tombstone_fragmenter.h"
 #include "db/version_set.h"
+#include "logging/log_buffer.h"
 #include "monitoring/thread_status_util.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
@@ -24,7 +25,6 @@
 #include "table/merging_iterator.h"
 #include "test_util/sync_point.h"
 #include "util/coding.h"
-#include "util/log_buffer.h"
 
 namespace rocksdb {
 

db/memtable_list.h

@@ -17,13 +17,13 @@
 #include "db/memtable.h"
 #include "db/range_del_aggregator.h"
 #include "file/filename.h"
+#include "logging/log_buffer.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/log_buffer.h"
 
 namespace rocksdb {
 

db/plain_table_db_test.cc

@@ -16,6 +16,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
@@ -32,7 +33,6 @@
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/hash.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"

db/version_builder_test.cc

@@ -6,9 +6,9 @@
 #include <string>
 #include "db/version_edit.h"
 #include "db/version_set.h"
+#include "logging/logging.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/logging.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/version_edit.cc

@@ -10,10 +10,10 @@
 #include "db/version_edit.h"
 
 #include "db/version_set.h"
+#include "logging/event_logger.h"
 #include "rocksdb/slice.h"
 #include "test_util/sync_point.h"
 #include "util/coding.h"
-#include "util/event_logger.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/version_set_test.cc

@@ -9,10 +9,10 @@
 
 #include "db/version_set.h"
 #include "db/log_writer.h"
+#include "logging/logging.h"
 #include "table/mock_table.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/logging.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

db/wal_manager.cc

@@ -24,6 +24,7 @@
 #include "db/write_batch_internal.h"
 #include "file/file_util.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
@@ -32,7 +33,6 @@
 #include "util/cast_util.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
 

env/env_hdfs.cc

@@ -17,8 +17,8 @@
 #include <algorithm>
 #include <iostream>
 #include <sstream>
+#include "logging/logging.h"
 #include "rocksdb/status.h"
-#include "util/logging.h"
 #include "util/string_util.h"
 
 #define HDFS_EXISTS 0

env/env_posix.cc

@@ -43,7 +43,8 @@
 #include <vector>
 
 #include "env/io_posix.h"
-#include "env/posix_logger.h"
+#include "logging/logging.h"
+#include "logging/posix_logger.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/thread_status_updater.h"
 #include "port/port.h"
@@ -52,7 +53,6 @@
 #include "test_util/sync_point.h"
 #include "util/coding.h"
 #include "util/compression_context_cache.h"
-#include "util/logging.h"
 #include "util/random.h"
 #include "util/string_util.h"
 #include "util/thread_local.h"

env/env_test.cc

@@ -38,13 +38,13 @@
 #endif
 
 #include "env/env_chroot.h"
+#include "logging/log_buffer.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/coding.h"
-#include "util/log_buffer.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
 

env/io_posix.cc

@@ -27,7 +27,7 @@
 #include <sys/syscall.h>
 #include <sys/sysmacros.h>
 #endif
-#include "env/posix_logger.h"
+#include "logging/posix_logger.h"
 #include "monitoring/iostats_context_imp.h"
 #include "port/port.h"
 #include "rocksdb/slice.h"

file/delete_scheduler.cc

@@ -11,10 +11,10 @@
 #include <vector>
 
 #include "file/sst_file_manager_impl.h"
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "test_util/sync_point.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 
 namespace rocksdb {

file/filename.cc

@@ -16,10 +16,10 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <vector>
+#include "logging/logging.h"
 #include "rocksdb/env.h"
 #include "test_util/sync_point.h"
 #include "util/file_reader_writer.h"
-#include "util/logging.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 

java/rocksjni/write_batch.cc

@@ -11,6 +11,7 @@
 #include "db/write_batch_internal.h"
 #include "include/org_rocksdb_WriteBatch.h"
 #include "include/org_rocksdb_WriteBatch_Handler.h"
+#include "logging/logging.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/memtablerep.h"
@@ -20,7 +21,6 @@
 #include "rocksjni/portal.h"
 #include "rocksjni/writebatchhandlerjnicallback.h"
 #include "table/scoped_arena_iterator.h"
-#include "util/logging.h"
 
 /*
  * Class:     org_rocksdb_WriteBatch

logging/auto_roll_logger.cc

@@ -3,10 +3,11 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-#include "util/auto_roll_logger.h"
+#include "logging/auto_roll_logger.h"
+
 #include <algorithm>
 #include "file/filename.h"
-#include "util/logging.h"
+#include "logging/logging.h"
 #include "util/mutexlock.h"
 
 namespace rocksdb {

logging/auto_roll_logger_test.cc

@@ -6,7 +6,7 @@
 
 #ifndef ROCKSDB_LITE
 
-#include "util/auto_roll_logger.h"
+#include "logging/auto_roll_logger.h"
 #include <errno.h>
 #include <sys/stat.h>
 #include <algorithm>
@@ -17,11 +17,11 @@
 #include <string>
 #include <thread>
 #include <vector>
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 namespace {

logging/event_logger.cc

@@ -7,14 +7,14 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include "util/event_logger.h"
+#include "logging/event_logger.h"
 
 #include <inttypes.h>
 #include <cassert>
 #include <sstream>
 #include <string>
 
-#include "util/logging.h"
+#include "logging/logging.h"
 #include "util/string_util.h"
 
 namespace rocksdb {

logging/event_logger.h

@@ -10,8 +10,8 @@
 #include <string>
 #include <chrono>
 
+#include "logging/log_buffer.h"
 #include "rocksdb/env.h"
-#include "util/log_buffer.h"
 
 namespace rocksdb {
 

logging/event_logger_test.cc

@@ -5,8 +5,8 @@
 
 #include <string>
 
+#include "logging/event_logger.h"
 #include "test_util/testharness.h"
-#include "util/event_logger.h"
 
 namespace rocksdb {
 

logging/log_buffer.cc

@@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "util/log_buffer.h"
+#include "logging/log_buffer.h"
 
 #include "port/sys_time.h"
 #include "port/port.h"

logging/logging.h

@@ -19,7 +19,7 @@
 
 inline const char* RocksLogShorterFileName(const char* file)
 {
-  // 15 is the length of "util/logging.h".
+  // 15 is the length of "logging/logging.h".
   // If the name of this file changed, please change this number, too.
   return file + (sizeof(__FILE__) > 15 ? sizeof(__FILE__) - 15 : 0);
 }

memory/arena.cc

@@ -19,10 +19,10 @@
 #include <sys/mman.h>
 #endif
 #include <algorithm>
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "test_util/sync_point.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

options/db_options.cc

@@ -11,12 +11,12 @@
 
 #include <inttypes.h>
 
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/env.h"
 #include "rocksdb/sst_file_manager.h"
 #include "rocksdb/wal_filter.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

port/port_posix.cc

@@ -18,11 +18,11 @@
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
 #include <unistd.h>
 #include <cstdlib>
-#include "util/logging.h"
+#include "logging/logging.h"
 
 namespace rocksdb {
 

port/util_logger.h

@@ -14,7 +14,7 @@
 // of what the new port_<platform>.h file must provide.
 
 #if defined(ROCKSDB_PLATFORM_POSIX)
-#include "env/posix_logger.h"
+#include "logging/posix_logger.h"
 #elif defined(OS_WIN)
 #include "port/win/win_logger.h"
 #endif

port/win/port_win.cc

@@ -33,7 +33,7 @@
 #include <codecvt>
 #endif
 
-#include "util/logging.h"
+#include "logging/logging.h"
 
 namespace rocksdb {
 

src.mk

@@ -72,6 +72,9 @@ LIB_SOURCES =                                                   \
   file/file_util.cc                                             \
   file/filename.cc                                              \
   file/sst_file_manager_impl.cc                                 \
+  logging/auto_roll_logger.cc                                   \
+  logging/event_logger.cc                                       \
+  logging/log_buffer.cc                                         \
   memory/arena.cc                                               \
   memory/concurrent_arena.cc                                    \
   memory/jemalloc_nodump_allocator.cc                           \
@@ -139,7 +142,6 @@ LIB_SOURCES =                                                   \
   test_util/sync_point_impl.cc                                  \
   test_util/transaction_test_util.cc                            \
   tools/dump/db_dump_tool.cc                                    \
-  util/auto_roll_logger.cc                                      \
   util/bloom.cc                                                 \
   util/build_version.cc                                         \
   util/coding.cc                                                \
@@ -149,11 +151,9 @@ LIB_SOURCES =                                                   \
   util/concurrent_task_limiter_impl.cc                          \
   util/crc32c.cc                                                \
   util/dynamic_bloom.cc                                         \
-  util/event_logger.cc                                          \
   util/file_reader_writer.cc                                    \
   util/filter_policy.cc                                         \
   util/hash.cc                                                  \
-  util/log_buffer.cc                                            \
   util/murmurhash.cc                                            \
   util/random.cc                                                \
   util/rate_limiter.cc                                          \
@@ -340,6 +340,8 @@ MAIN_SOURCES =                                                          \
   env/env_basic_test.cc                                                 \
   env/env_test.cc                                                       \
   env/mock_env_test.cc                                                  \
+  logging/auto_roll_logger_test.cc                                      \
+  logging/event_logger_test.cc                                          \
   memory/arena_test.cc                                                  \
   memtable/inlineskiplist_test.cc                                       \
   memtable/memtablerep_bench.cc                                         \
@@ -369,13 +371,11 @@ MAIN_SOURCES =                                                          \
   tools/reduce_levels_test.cc                                           \
   tools/sst_dump_test.cc                                                \
   tools/trace_analyzer_test.cc						\
-  util/auto_roll_logger_test.cc                                         \
   util/autovector_test.cc                                               \
   util/bloom_test.cc                                                    \
   util/coding_test.cc                                                   \
   util/crc32c_test.cc                                                   \
   util/dynamic_bloom_test.cc                                            \
-  util/event_logger_test.cc                                             \
   util/filelock_test.cc                                                 \
   util/log_write_bench.cc                                               \
   util/rate_limiter_test.cc                                             \

table/block_based/block.cc

@@ -15,6 +15,7 @@
 #include <unordered_map>
 #include <vector>
 
+#include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
@@ -23,7 +24,6 @@
 #include "table/block_based/data_block_footer.h"
 #include "table/format.h"
 #include "util/coding.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

table/block_based/partitioned_filter_block_test.cc

@@ -11,11 +11,11 @@
 #include "table/full_filter_bits_builder.h"
 
 #include "index_builder.h"
+#include "logging/logging.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/coding.h"
 #include "util/hash.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

table/block_fetcher.cc

@@ -12,6 +12,7 @@
 #include <inttypes.h>
 #include <string>
 
+#include "logging/logging.h"
 #include "memory/memory_allocator.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/statistics.h"
@@ -24,7 +25,6 @@
 #include "util/compression.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/logging.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/xxhash.h"

table/format.cc

@@ -13,6 +13,7 @@
 #include <string>
 
 #include "block_fetcher.h"
+#include "logging/logging.h"
 #include "memory/memory_allocator.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/statistics.h"
@@ -24,7 +25,6 @@
 #include "util/compression.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/logging.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
 #include "util/xxhash.h"

test_util/transaction_test_util.cc

@@ -24,7 +24,7 @@
 
 #include "db/dbformat.h"
 #include "db/snapshot_impl.h"
-#include "util/logging.h"
+#include "logging/logging.h"
 #include "util/random.h"
 #include "util/string_util.h"
 

tools/db_stress.cc

@@ -47,6 +47,7 @@ int main() {
 #include "db/db_impl/db_impl.h"
 #include "db/version_set.h"
 #include "hdfs/env_hdfs.h"
+#include "logging/logging.h"
 #include "monitoring/histogram.h"
 #include "options/options_helper.h"
 #include "port/port.h"
@@ -66,7 +67,6 @@ int main() {
 #include "util/compression.h"
 #include "util/crc32c.h"
 #include "util/gflags_compat.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
 #include "util/string_util.h"

util/bloom_test.cc

@@ -17,13 +17,13 @@ int main() {
 
 #include <vector>
 
+#include "logging/logging.h"
 #include "memory/arena.h"
 #include "rocksdb/filter_policy.h"
 #include "table/full_filter_bits_builder.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/gflags_compat.h"
-#include "util/logging.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;
 

util/comparator.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 "rocksdb/comparator.h"
+#include <stdint.h>
 #include <algorithm>
 #include <memory>
-#include <stdint.h>
-#include "rocksdb/comparator.h"
-#include "rocksdb/slice.h"
+#include "logging/logging.h"
 #include "port/port.h"
-#include "util/logging.h"
+#include "rocksdb/slice.h"
 
 namespace rocksdb {
 

util/dynamic_bloom_test.cc

@@ -24,12 +24,12 @@ int main() {
 #include <vector>
 
 #include "dynamic_bloom.h"
+#include "logging/logging.h"
 #include "memory/arena.h"
 #include "port/port.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/gflags_compat.h"
-#include "util/logging.h"
 #include "util/stop_watch.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;

utilities/backupable/backupable_db.cc

@@ -11,6 +11,7 @@
 
 #include "rocksdb/utilities/backupable_db.h"
 #include "file/filename.h"
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/rate_limiter.h"
 #include "rocksdb/transaction_log.h"
@@ -19,7 +20,6 @@
 #include "util/coding.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/logging.h"
 #include "util/string_util.h"
 #include "utilities/checkpoint/checkpoint_impl.h"
 

utilities/blob_db/blob_db_impl.cc

@@ -16,6 +16,7 @@
 #include "file/file_util.h"
 #include "file/filename.h"
 #include "file/sst_file_manager_impl.h"
+#include "logging/logging.h"
 #include "monitoring/instrumented_mutex.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/convenience.h"
@@ -31,7 +32,6 @@
 #include "util/cast_util.h"
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
-#include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
 #include "util/stop_watch.h"

utilities/blob_db/blob_db_impl_filesnapshot.cc

@@ -8,7 +8,7 @@
 #include "utilities/blob_db/blob_db_impl.h"
 
 #include "file/filename.h"
-#include "util/logging.h"
+#include "logging/logging.h"
 #include "util/mutexlock.h"
 
 // BlobDBImpl methods to get snapshot of files, e.g. for replication.

utilities/blob_db/blob_file.cc

@@ -21,7 +21,7 @@
 #include "db/db_impl/db_impl.h"
 #include "db/dbformat.h"
 #include "file/filename.h"
-#include "util/logging.h"
+#include "logging/logging.h"
 #include "utilities/blob_db/blob_db_impl.h"
 
 namespace rocksdb {

utilities/merge_operators/uint64add.cc

@@ -5,11 +5,11 @@
 
 #include <memory>
 
+#include "logging/logging.h"
 #include "rocksdb/env.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/slice.h"
 #include "util/coding.h"
-#include "util/logging.h"
 #include "utilities/merge_operators.h"
 
 using namespace rocksdb;

utilities/persistent_cache/block_cache_tier.cc

@@ -10,9 +10,9 @@
 #include <utility>
 #include <vector>
 
+#include "logging/logging.h"
 #include "port/port.h"
 #include "test_util/sync_point.h"
-#include "util/logging.h"
 #include "util/stop_watch.h"
 #include "utilities/persistent_cache/block_cache_tier_file.h"
 

utilities/persistent_cache/block_cache_tier_file.cc

@@ -13,9 +13,9 @@
 #include <memory>
 #include <vector>
 
+#include "logging/logging.h"
 #include "port/port.h"
 #include "util/crc32c.h"
-#include "util/logging.h"
 
 namespace rocksdb {
 

utilities/transactions/optimistic_transaction_test.cc

@@ -9,6 +9,7 @@
 #include <string>
 #include <thread>
 
+#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/utilities/optimistic_transaction_db.h"
@@ -16,7 +17,6 @@
 #include "test_util/testharness.h"
 #include "test_util/transaction_test_util.h"
 #include "util/crc32c.h"
-#include "util/logging.h"
 #include "util/random.h"
 
 using std::string;