From e9e0101ca46f00e8a456e69912a913d907be56fc Mon Sep 17 00:00:00 2001 From: Siying Dong Date: Thu, 30 May 2019 11:21:38 -0700 Subject: [PATCH] Move test related files under util/ to test_util/ (#5377) Summary: There are too many types of files under util/. Some test related files don't belong to there or just are just loosely related. Mo ve them to a new directory test_util/, so that util/ is cleaner. Pull Request resolved: https://github.com/facebook/rocksdb/pull/5377 Differential Revision: D15551366 Pulled By: siying fbshipit-source-id: 0f5c8653832354ef8caa31749c0143815d719e2c --- CMakeLists.txt | 12 ++++++------ Makefile | 4 ++-- TARGETS | 14 +++++++------- buckifier/buckify_rocksdb.py | 2 +- cache/cache_test.cc | 2 +- cache/lru_cache_test.cc | 2 +- db/builder.cc | 2 +- db/column_family_test.cc | 8 ++++---- db/compact_files_test.cc | 4 ++-- db/compaction.cc | 2 +- db/compaction_iterator.cc | 2 +- db/compaction_iterator_test.cc | 4 ++-- db/compaction_job.cc | 2 +- db/compaction_job_stats_test.cc | 6 +++--- db/compaction_job_test.cc | 4 ++-- db/compaction_picker.cc | 2 +- db/compaction_picker_test.cc | 4 ++-- db/compaction_picker_universal.cc | 2 +- db/comparator_db_test.cc | 4 ++-- db/corruption_test.cc | 4 ++-- db/cuckoo_table_db_test.cc | 4 ++-- db/db_basic_test.cc | 4 ++-- db/db_compaction_test.cc | 4 ++-- db/db_encryption_test.cc | 2 +- db/db_filesnapshot.cc | 2 +- db/db_flush_test.cc | 4 ++-- db/db_impl.cc | 2 +- db/db_impl_compaction_flush.cc | 2 +- db/db_impl_open.cc | 2 +- db/db_impl_write.cc | 2 +- db/db_iter_stress_test.cc | 2 +- db/db_iter_test.cc | 4 ++-- db/db_options_test.cc | 4 ++-- db/db_range_del_test.cc | 2 +- db/db_secondary_test.cc | 4 ++-- db/db_table_properties_test.cc | 4 ++-- db/db_test.cc | 6 +++--- db/db_test_util.h | 8 ++++---- db/db_universal_compaction_test.cc | 2 +- db/db_wal_test.cc | 4 ++-- db/db_write_test.cc | 4 ++-- db/dbformat_test.cc | 2 +- db/deletefile_test.cc | 6 +++--- db/error_handler_test.cc | 4 ++-- db/external_sst_file_basic_test.cc | 2 +- db/external_sst_file_ingestion_job.cc | 2 +- db/external_sst_file_test.cc | 4 ++-- db/fault_injection_test.cc | 8 ++++---- db/file_indexer_test.cc | 4 ++-- db/filename_test.cc | 2 +- db/flush_job.cc | 2 +- db/flush_job_test.cc | 4 ++-- db/forward_iterator.cc | 2 +- db/forward_iterator_bench.cc | 2 +- db/listener_test.cc | 6 +++--- db/log_test.cc | 4 ++-- db/manual_compaction_test.cc | 2 +- db/memtable_list.cc | 2 +- db/memtable_list_test.cc | 4 ++-- db/merge_helper_test.cc | 4 ++-- db/merge_test.cc | 2 +- db/obsolete_files_test.cc | 6 +++--- db/options_file_test.cc | 2 +- db/perf_context_test.cc | 2 +- db/plain_table_db_test.cc | 4 ++-- db/prefix_test.cc | 2 +- db/range_del_aggregator_bench.cc | 2 +- db/range_del_aggregator_test.cc | 2 +- db/range_tombstone_fragmenter_test.cc | 2 +- db/table_cache.cc | 2 +- db/table_properties_collector_test.cc | 4 ++-- db/version_builder_test.cc | 4 ++-- db/version_edit.cc | 2 +- db/version_edit_test.cc | 4 ++-- db/version_set.cc | 2 +- db/version_set_test.cc | 4 ++-- db/wal_manager.cc | 2 +- db/wal_manager_test.cc | 4 ++-- db/write_batch_test.cc | 2 +- db/write_callback_test.cc | 4 ++-- db/write_controller_test.cc | 2 +- db/write_thread.cc | 2 +- env/env_basic_test.cc | 2 +- env/env_posix.cc | 2 +- env/env_test.cc | 6 +++--- env/io_posix.cc | 2 +- env/mock_env_test.cc | 2 +- env/posix_logger.h | 2 +- file/delete_scheduler.cc | 2 +- file/delete_scheduler_test.cc | 6 +++--- file/filename.cc | 2 +- file/sst_file_manager_impl.cc | 2 +- java/rocksjni/write_batch_test.cc | 2 +- memtable/inlineskiplist_test.cc | 2 +- memtable/memtablerep_bench.cc | 2 +- memtable/skiplist_test.cc | 2 +- memtable/write_buffer_manager_test.cc | 2 +- monitoring/histogram_test.cc | 2 +- monitoring/instrumented_mutex.cc | 2 +- monitoring/iostats_context_test.cc | 2 +- monitoring/statistics_test.cc | 4 ++-- options/options_parser.cc | 2 +- options/options_settable_test.cc | 2 +- options/options_test.cc | 4 ++-- port/win/env_default.cc | 2 +- port/win/io_win.cc | 2 +- src.mk | 12 ++++++------ table/block.h | 2 +- table/block_based_filter_block_test.cc | 4 ++-- table/block_based_table_reader.cc | 2 +- table/block_test.cc | 4 ++-- table/cleanable_test.cc | 4 ++-- table/cuckoo_table_builder_test.cc | 4 ++-- table/cuckoo_table_reader_test.cc | 4 ++-- table/data_block_hash_index_test.cc | 4 ++-- table/full_filter_block_test.cc | 4 ++-- table/merger_test.cc | 4 ++-- table/merging_iterator.cc | 2 +- table/meta_blocks.cc | 2 +- table/mock_table.h | 4 ++-- table/partitioned_filter_block_test.cc | 4 ++-- table/sst_file_reader_test.cc | 4 ++-- table/sst_file_writer.cc | 2 +- table/table_reader_bench.cc | 4 ++-- table/table_test.cc | 6 +++--- {util => test_util}/fault_injection_test_env.cc | 2 +- {util => test_util}/fault_injection_test_env.h | 0 {util => test_util}/mock_time_env.h | 0 {util => test_util}/sync_point.cc | 4 ++-- {util => test_util}/sync_point.h | 0 {util => test_util}/sync_point_impl.cc | 2 +- {util => test_util}/sync_point_impl.h | 2 +- {util => test_util}/testharness.cc | 2 +- {util => test_util}/testharness.h | 0 {util => test_util}/testutil.cc | 2 +- {util => test_util}/testutil.h | 0 {util => test_util}/transaction_test_util.cc | 2 +- {util => test_util}/transaction_test_util.h | 0 tools/db_bench_tool.cc | 4 ++-- tools/db_bench_tool_test.cc | 4 ++-- tools/db_repl_stress.cc | 2 +- tools/db_stress.cc | 4 ++-- tools/ldb_cmd_test.cc | 2 +- tools/reduce_levels_test.cc | 4 ++-- tools/sst_dump_test.cc | 4 ++-- tools/trace_analyzer_test.cc | 4 ++-- util/arena.cc | 2 +- util/arena_test.cc | 2 +- util/auto_roll_logger.h | 2 +- util/auto_roll_logger_test.cc | 4 ++-- util/autovector_test.cc | 4 ++-- util/bloom_test.cc | 4 ++-- util/coding_test.cc | 2 +- util/crc32c_test.cc | 2 +- util/dynamic_bloom_test.cc | 4 ++-- util/event_logger_test.cc | 2 +- util/file_reader_writer.cc | 2 +- util/file_reader_writer.h | 2 +- util/file_reader_writer_test.cc | 4 ++-- util/filelock_test.cc | 2 +- util/hash_test.cc | 2 +- util/log_write_bench.cc | 4 ++-- util/rate_limiter.cc | 2 +- util/rate_limiter_test.cc | 4 ++-- util/repeatable_thread.h | 2 +- util/repeatable_thread_test.cc | 4 ++-- util/slice_transform_test.cc | 2 +- util/thread_list_test.cc | 2 +- util/thread_local_test.cc | 6 +++--- util/timer_queue.h | 2 +- utilities/backupable/backupable_db.cc | 2 +- utilities/backupable/backupable_db_test.cc | 6 +++--- utilities/blob_db/blob_db_impl.cc | 2 +- utilities/blob_db/blob_db_test.cc | 6 +++--- utilities/cassandra/cassandra_format_test.cc | 2 +- utilities/cassandra/cassandra_functional_test.cc | 2 +- utilities/cassandra/cassandra_row_merge_test.cc | 2 +- utilities/cassandra/cassandra_serialize_test.cc | 2 +- utilities/cassandra/format.h | 2 +- utilities/cassandra/test_utils.h | 2 +- utilities/checkpoint/checkpoint_impl.cc | 2 +- utilities/checkpoint/checkpoint_test.cc | 6 +++--- utilities/env_librados_test.cc | 2 +- utilities/env_mirror_test.cc | 2 +- utilities/env_timed_test.cc | 2 +- utilities/memory/memory_test.cc | 4 ++-- .../string_append/stringappend_test.cc | 2 +- utilities/object_registry_test.cc | 2 +- utilities/options/options_util_test.cc | 4 ++-- utilities/persistent_cache/block_cache_tier.cc | 2 +- utilities/persistent_cache/hash_table_test.cc | 2 +- utilities/persistent_cache/persistent_cache_test.h | 2 +- .../transactions/optimistic_transaction_test.cc | 4 ++-- utilities/transactions/pessimistic_transaction.cc | 2 +- .../transactions/pessimistic_transaction_db.cc | 2 +- utilities/transactions/transaction_lock_mgr.cc | 2 +- utilities/transactions/transaction_test.cc | 10 +++++----- utilities/transactions/transaction_test.h | 10 +++++----- .../write_prepared_transaction_test.cc | 10 +++++----- utilities/transactions/write_prepared_txn_db.cc | 2 +- utilities/ttl/ttl_test.cc | 2 +- utilities/util_merge_operators_test.cc | 4 ++-- .../write_batch_with_index_test.cc | 2 +- 203 files changed, 322 insertions(+), 322 deletions(-) rename {util => test_util}/fault_injection_test_env.cc (99%) rename {util => test_util}/fault_injection_test_env.h (100%) rename {util => test_util}/mock_time_env.h (100%) rename {util => test_util}/sync_point.cc (95%) rename {util => test_util}/sync_point.h (100%) rename {util => test_util}/sync_point_impl.cc (98%) rename {util => test_util}/sync_point_impl.h (98%) rename {util => test_util}/testharness.cc (97%) rename {util => test_util}/testharness.h (100%) rename {util => test_util}/testutil.cc (99%) rename {util => test_util}/testutil.h (100%) rename {util => test_util}/transaction_test_util.cc (99%) rename {util => test_util}/transaction_test_util.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d74152d9..6449047fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -600,6 +600,10 @@ set(SOURCES table/sst_file_writer.cc table/table_properties.cc table/two_level_iterator.cc + test_util/sync_point.cc + test_util/sync_point_impl.cc + test_util/testutil.cc + test_util/transaction_test_util.cc tools/db_bench_tool.cc tools/dump/db_dump_tool.cc tools/ldb_cmd.cc @@ -629,13 +633,9 @@ set(SOURCES util/slice.cc util/status.cc util/string_util.cc - util/sync_point.cc - util/sync_point_impl.cc - util/testutil.cc util/thread_local.cc util/threadpool_imp.cc util/trace_replay.cc - util/transaction_test_util.cc util/xxhash.cc utilities/backupable/backupable_db.cc utilities/blob_db/blob_compaction_filter.cc @@ -1006,7 +1006,7 @@ if(WITH_TESTS) tools/db_bench.cc table/table_reader_bench.cc utilities/persistent_cache/hash_table_bench.cc) - add_library(testharness OBJECT util/testharness.cc) + add_library(testharness OBJECT test_util/testharness.cc) foreach(sourcefile ${BENCHMARKS}) get_filename_component(exename ${sourcefile} NAME_WE) add_executable(${exename}${ARTIFACT_SUFFIX} ${sourcefile} @@ -1020,7 +1020,7 @@ if(WITH_TESTS) db/db_test_util.cc monitoring/thread_status_updater_debug.cc table/mock_table.cc - util/fault_injection_test_env.cc + test_util/fault_injection_test_env.cc utilities/cassandra/test_utils.cc ) # test utilities are only build in debug diff --git a/Makefile b/Makefile index ec0a04ed1..16d5da0b1 100644 --- a/Makefile +++ b/Makefile @@ -404,8 +404,8 @@ LIBOBJECTS += $(TOOL_LIB_SOURCES:.cc=.o) MOCKOBJECTS = $(MOCK_LIB_SOURCES:.cc=.o) GTEST = $(GTEST_DIR)/gtest/gtest-all.o -TESTUTIL = ./util/testutil.o -TESTHARNESS = ./util/testharness.o $(TESTUTIL) $(MOCKOBJECTS) $(GTEST) +TESTUTIL = ./test_util/testutil.o +TESTHARNESS = ./test_util/testharness.o $(TESTUTIL) $(MOCKOBJECTS) $(GTEST) VALGRIND_ERROR = 2 VALGRIND_VER := $(join $(VALGRIND_VER),valgrind) diff --git a/TARGETS b/TARGETS index 7d2715157..c438aa3fb 100644 --- a/TARGETS +++ b/TARGETS @@ -207,6 +207,9 @@ cpp_library( "table/sst_file_writer.cc", "table/table_properties.cc", "table/two_level_iterator.cc", + "test_util/sync_point.cc", + "test_util/sync_point_impl.cc", + "test_util/transaction_test_util.cc", "tools/dump/db_dump_tool.cc", "tools/ldb_cmd.cc", "tools/ldb_tool.cc", @@ -235,12 +238,9 @@ cpp_library( "util/slice.cc", "util/status.cc", "util/string_util.cc", - "util/sync_point.cc", - "util/sync_point_impl.cc", "util/thread_local.cc", "util/threadpool_imp.cc", "util/trace_replay.cc", - "util/transaction_test_util.cc", "util/xxhash.cc", "utilities/backupable/backupable_db.cc", "utilities/blob_db/blob_compaction_filter.cc", @@ -309,10 +309,10 @@ cpp_library( srcs = [ "db/db_test_util.cc", "table/mock_table.cc", + "test_util/fault_injection_test_env.cc", + "test_util/testharness.cc", + "test_util/testutil.cc", "tools/trace_analyzer_tool.cc", - "util/fault_injection_test_env.cc", - "util/testharness.cc", - "util/testutil.cc", "utilities/cassandra/test_utils.cc", ], auto_headers = AutoHeaders.RECURSIVE_GLOB, @@ -326,9 +326,9 @@ cpp_library( cpp_library( name = "rocksdb_tools_lib", srcs = [ + "test_util/testutil.cc", "tools/db_bench_tool.cc", "tools/trace_analyzer_tool.cc", - "util/testutil.cc", ], auto_headers = AutoHeaders.RECURSIVE_GLOB, arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS, diff --git a/buckifier/buckify_rocksdb.py b/buckifier/buckify_rocksdb.py index a5d71b65d..94b63a4e8 100644 --- a/buckifier/buckify_rocksdb.py +++ b/buckifier/buckify_rocksdb.py @@ -118,7 +118,7 @@ def generate_targets(repo_path): "rocksdb_tools_lib", src_mk.get("BENCH_LIB_SOURCES", []) + src_mk.get("ANALYZER_LIB_SOURCES", []) + - ["util/testutil.cc"], + ["test_util/testutil.cc"], [":rocksdb_lib"]) # test for every test we found in the Makefile diff --git a/cache/cache_test.cc b/cache/cache_test.cc index f9f77234c..377ae1468 100644 --- a/cache/cache_test.cc +++ b/cache/cache_test.cc @@ -18,7 +18,7 @@ #include "cache/lru_cache.h" #include "util/coding.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/cache/lru_cache_test.cc b/cache/lru_cache_test.cc index 9980dd72b..575764611 100644 --- a/cache/lru_cache_test.cc +++ b/cache/lru_cache_test.cc @@ -8,7 +8,7 @@ #include #include #include "port/port.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/builder.cc b/db/builder.cc index b42ac187e..2b97ce1d6 100644 --- a/db/builder.cc +++ b/db/builder.cc @@ -34,7 +34,7 @@ #include "table/internal_iterator.h" #include "util/file_reader_writer.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/column_family_test.cc b/db/column_family_test.cc index bdc832bd2..f5d57c35b 100644 --- a/db/column_family_test.cc +++ b/db/column_family_test.cc @@ -21,11 +21,11 @@ #include "rocksdb/env.h" #include "rocksdb/iterator.h" #include "util/coding.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/compact_files_test.cc b/db/compact_files_test.cc index ce80375e0..b97fd064e 100644 --- a/db/compact_files_test.cc +++ b/db/compact_files_test.cc @@ -15,8 +15,8 @@ #include "rocksdb/db.h" #include "rocksdb/env.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/compaction.cc b/db/compaction.cc index f8805376f..00ebd28b0 100644 --- a/db/compaction.cc +++ b/db/compaction.cc @@ -19,7 +19,7 @@ #include "db/column_family.h" #include "rocksdb/compaction_filter.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/compaction_iterator.cc b/db/compaction_iterator.cc index ca55eef71..7e0609699 100644 --- a/db/compaction_iterator.cc +++ b/db/compaction_iterator.cc @@ -9,7 +9,7 @@ #include "port/likely.h" #include "rocksdb/listener.h" #include "table/internal_iterator.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #define DEFINITELY_IN_SNAPSHOT(seq, snapshot) \ ((seq) <= (snapshot) && \ diff --git a/db/compaction_iterator_test.cc b/db/compaction_iterator_test.cc index c466f6c91..b0a553136 100644 --- a/db/compaction_iterator_test.cc +++ b/db/compaction_iterator_test.cc @@ -10,8 +10,8 @@ #include "port/port.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/compaction_job.cc b/db/compaction_job.cc index 7d2015e56..91c7f437a 100644 --- a/db/compaction_job.cc +++ b/db/compaction_job.cc @@ -61,7 +61,7 @@ #include "util/random.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc index 5ca6bf4a3..91441f5d7 100644 --- a/db/compaction_job_stats_test.cc +++ b/db/compaction_job_stats_test.cc @@ -58,9 +58,9 @@ #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 "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" #if !defined(IOS_CROSS_COMPILE) diff --git a/db/compaction_job_test.cc b/db/compaction_job_test.cc index 60394cc97..4608cceea 100644 --- a/db/compaction_job_test.cc +++ b/db/compaction_job_test.cc @@ -27,8 +27,8 @@ #include "table/mock_table.h" #include "util/file_reader_writer.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/compaction_picker.cc b/db/compaction_picker.cc index f500def41..c01f2884d 100644 --- a/db/compaction_picker.cc +++ b/db/compaction_picker.cc @@ -25,7 +25,7 @@ #include "util/log_buffer.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/compaction_picker_test.cc b/db/compaction_picker_test.cc index c759dae8b..82fc16f4f 100644 --- a/db/compaction_picker_test.cc +++ b/db/compaction_picker_test.cc @@ -14,8 +14,8 @@ #include "util/logging.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/compaction_picker_universal.cc b/db/compaction_picker_universal.cc index c25ae94fa..b8d23795f 100644 --- a/db/compaction_picker_universal.cc +++ b/db/compaction_picker_universal.cc @@ -25,7 +25,7 @@ #include "util/log_buffer.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { namespace { diff --git a/db/comparator_db_test.cc b/db/comparator_db_test.cc index a7ff58794..ba7042049 100644 --- a/db/comparator_db_test.cc +++ b/db/comparator_db_test.cc @@ -12,8 +12,8 @@ #include "util/hash.h" #include "util/kv_map.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" using std::unique_ptr; diff --git a/db/corruption_test.cc b/db/corruption_test.cc index ba97ca150..379c33e45 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -28,8 +28,8 @@ #include "table/block_based_table_builder.h" #include "table/meta_blocks.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/cuckoo_table_db_test.cc b/db/cuckoo_table_db_test.cc index 2d4487ff4..ecd6d71ca 100644 --- a/db/cuckoo_table_db_test.cc +++ b/db/cuckoo_table_db_test.cc @@ -12,8 +12,8 @@ #include "table/cuckoo_table_reader.h" #include "table/meta_blocks.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/db_basic_test.cc b/db/db_basic_test.cc index 236a53465..45524b250 100644 --- a/db/db_basic_test.cc +++ b/db/db_basic_test.cc @@ -10,9 +10,9 @@ #include "db/db_test_util.h" #include "port/stack_trace.h" #include "rocksdb/perf_context.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #if !defined(ROCKSDB_LITE) -#include "util/sync_point.h" +#include "test_util/sync_point.h" #endif namespace rocksdb { diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc index 91a04205e..623836454 100644 --- a/db/db_compaction_test.cc +++ b/db/db_compaction_test.cc @@ -14,8 +14,8 @@ #include "rocksdb/experimental.h" #include "rocksdb/utilities/convenience.h" #include "util/concurrent_task_limiter_impl.h" -#include "util/fault_injection_test_env.h" -#include "util/sync_point.h" +#include "test_util/fault_injection_test_env.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/db_encryption_test.cc b/db/db_encryption_test.cc index 46ba411b6..4ddc11986 100644 --- a/db/db_encryption_test.cc +++ b/db/db_encryption_test.cc @@ -7,7 +7,7 @@ #include "port/stack_trace.h" #include "rocksdb/perf_context.h" #if !defined(ROCKSDB_LITE) -#include "util/sync_point.h" +#include "test_util/sync_point.h" #endif #include #include diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc index 5b630e216..a1a1c8f99 100644 --- a/db/db_filesnapshot.cc +++ b/db/db_filesnapshot.cc @@ -23,7 +23,7 @@ #include "rocksdb/db.h" #include "rocksdb/env.h" #include "util/mutexlock.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/db_flush_test.cc b/db/db_flush_test.cc index 876605b2e..b901a5a78 100644 --- a/db/db_flush_test.cc +++ b/db/db_flush_test.cc @@ -9,8 +9,8 @@ #include "db/db_test_util.h" #include "port/stack_trace.h" -#include "util/fault_injection_test_env.h" -#include "util/sync_point.h" +#include "test_util/fault_injection_test_env.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/db_impl.cc b/db/db_impl.cc index e7ed18664..749bd3629 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -97,7 +97,7 @@ #include "util/mutexlock.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { const std::string kDefaultColumnFamilyName("default"); diff --git a/db/db_impl_compaction_flush.cc b/db/db_impl_compaction_flush.cc index 1e39bdd42..c5cc07366 100644 --- a/db/db_impl_compaction_flush.cc +++ b/db/db_impl_compaction_flush.cc @@ -22,7 +22,7 @@ #include "monitoring/thread_status_updater.h" #include "monitoring/thread_status_util.h" #include "util/concurrent_task_limiter_impl.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/db_impl_open.cc b/db/db_impl_open.cc index 4240b2012..0be85031b 100644 --- a/db/db_impl_open.cc +++ b/db/db_impl_open.cc @@ -20,7 +20,7 @@ #include "rocksdb/wal_filter.h" #include "table/block_based_table_factory.h" #include "util/rate_limiter.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { Options SanitizeOptions(const std::string& dbname, const Options& src) { diff --git a/db/db_impl_write.cc b/db/db_impl_write.cc index 92edc8425..98463f7b2 100644 --- a/db/db_impl_write.cc +++ b/db/db_impl_write.cc @@ -16,7 +16,7 @@ #include "db/event_helpers.h" #include "monitoring/perf_context_imp.h" #include "options/options_helper.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { // Convenience methods diff --git a/db/db_iter_stress_test.cc b/db/db_iter_stress_test.cc index a0f1dfeab..8c3588e9a 100644 --- a/db/db_iter_stress_test.cc +++ b/db/db_iter_stress_test.cc @@ -10,7 +10,7 @@ #include "rocksdb/slice.h" #include "util/random.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/merge_operators.h" #ifdef GFLAGS diff --git a/db/db_iter_test.cc b/db/db_iter_test.cc index 29fbd3208..49e670abc 100644 --- a/db/db_iter_test.cc +++ b/db/db_iter_test.cc @@ -18,8 +18,8 @@ #include "table/iterator_wrapper.h" #include "table/merging_iterator.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/db_options_test.cc b/db/db_options_test.cc index cb9a0e02e..37a9f1a36 100644 --- a/db/db_options_test.cc +++ b/db/db_options_test.cc @@ -20,8 +20,8 @@ #include "rocksdb/rate_limiter.h" #include "rocksdb/stats_history.h" #include "util/random.h" -#include "util/sync_point.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/db_range_del_test.cc b/db/db_range_del_test.cc index aa63286f6..16d682fc0 100644 --- a/db/db_range_del_test.cc +++ b/db/db_range_del_test.cc @@ -5,7 +5,7 @@ #include "db/db_test_util.h" #include "port/stack_trace.h" -#include "util/testutil.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/db_secondary_test.cc b/db/db_secondary_test.cc index a4267c7d5..50a0923b4 100644 --- a/db/db_secondary_test.cc +++ b/db/db_secondary_test.cc @@ -10,8 +10,8 @@ #include "db/db_impl_secondary.h" #include "db/db_test_util.h" #include "port/stack_trace.h" -#include "util/fault_injection_test_env.h" -#include "util/sync_point.h" +#include "test_util/fault_injection_test_env.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/db_table_properties_test.cc b/db/db_table_properties_test.cc index 77ea0020d..82f106133 100644 --- a/db/db_table_properties_test.cc +++ b/db/db_table_properties_test.cc @@ -14,8 +14,8 @@ #include "port/stack_trace.h" #include "rocksdb/db.h" #include "rocksdb/utilities/table_properties_collectors.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #ifndef ROCKSDB_LITE diff --git a/db/db_test.cc b/db/db_test.cc index 7864a7e2c..66df2323d 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -63,9 +63,9 @@ #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 "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/db_test_util.h b/db/db_test_util.h index 81186bfb9..3bc107889 100644 --- a/db/db_test_util.h +++ b/db/db_test_util.h @@ -46,13 +46,13 @@ #include "table/plain_table_factory.h" #include "table/scoped_arena_iterator.h" #include "util/compression.h" -#include "util/mock_time_env.h" +#include "test_util/mock_time_env.h" #include "util/mutexlock.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/db_universal_compaction_test.cc b/db/db_universal_compaction_test.cc index 2bd8af684..4f1df4a7d 100644 --- a/db/db_universal_compaction_test.cc +++ b/db/db_universal_compaction_test.cc @@ -11,7 +11,7 @@ #include "port/stack_trace.h" #if !defined(ROCKSDB_LITE) #include "rocksdb/utilities/table_properties_collectors.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/db_wal_test.cc b/db/db_wal_test.cc index 78f72b4a0..9a1382e98 100644 --- a/db/db_wal_test.cc +++ b/db/db_wal_test.cc @@ -11,8 +11,8 @@ #include "options/options_helper.h" #include "port/port.h" #include "port/stack_trace.h" -#include "util/fault_injection_test_env.h" -#include "util/sync_point.h" +#include "test_util/fault_injection_test_env.h" +#include "test_util/sync_point.h" namespace rocksdb { class DBWALTest : public DBTestBase { diff --git a/db/db_write_test.cc b/db/db_write_test.cc index e6bab8751..322381b38 100644 --- a/db/db_write_test.cc +++ b/db/db_write_test.cc @@ -12,9 +12,9 @@ #include "db/write_thread.h" #include "port/port.h" #include "port/stack_trace.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/dbformat_test.cc b/db/dbformat_test.cc index 0b16c13f5..e3f06fe6b 100644 --- a/db/dbformat_test.cc +++ b/db/dbformat_test.cc @@ -9,7 +9,7 @@ #include "db/dbformat.h" #include "util/logging.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc index 81ff8d0b9..9c67102c5 100644 --- a/db/deletefile_test.cc +++ b/db/deletefile_test.cc @@ -21,9 +21,9 @@ #include "rocksdb/env.h" #include "rocksdb/transaction_log.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/error_handler_test.cc b/db/error_handler_test.cc index d33e19df5..c18706fc2 100644 --- a/db/error_handler_test.cc +++ b/db/error_handler_test.cc @@ -12,9 +12,9 @@ #include "port/stack_trace.h" #include "rocksdb/perf_context.h" #include "rocksdb/sst_file_manager.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #if !defined(ROCKSDB_LITE) -#include "util/sync_point.h" +#include "test_util/sync_point.h" #endif namespace rocksdb { diff --git a/db/external_sst_file_basic_test.cc b/db/external_sst_file_basic_test.cc index 256db0728..91a422bed 100644 --- a/db/external_sst_file_basic_test.cc +++ b/db/external_sst_file_basic_test.cc @@ -9,7 +9,7 @@ #include "port/port.h" #include "port/stack_trace.h" #include "rocksdb/sst_file_writer.h" -#include "util/testutil.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/external_sst_file_ingestion_job.cc b/db/external_sst_file_ingestion_job.cc index 7bfc64f77..26cd1127b 100644 --- a/db/external_sst_file_ingestion_job.cc +++ b/db/external_sst_file_ingestion_job.cc @@ -24,7 +24,7 @@ #include "table/table_builder.h" #include "util/file_reader_writer.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/external_sst_file_test.cc b/db/external_sst_file_test.cc index 0a0994f0e..ebd6cb2b1 100644 --- a/db/external_sst_file_test.cc +++ b/db/external_sst_file_test.cc @@ -11,8 +11,8 @@ #include "port/port.h" #include "port/stack_trace.h" #include "rocksdb/sst_file_writer.h" -#include "util/fault_injection_test_env.h" -#include "util/testutil.h" +#include "test_util/fault_injection_test_env.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc index 1bfaa2994..330df7bfe 100644 --- a/db/fault_injection_test.cc +++ b/db/fault_injection_test.cc @@ -21,12 +21,12 @@ #include "rocksdb/env.h" #include "rocksdb/table.h" #include "rocksdb/write_batch.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/logging.h" #include "util/mutexlock.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/file_indexer_test.cc b/db/file_indexer_test.cc index 935a01ef8..754cb3c46 100644 --- a/db/file_indexer_test.cc +++ b/db/file_indexer_test.cc @@ -13,8 +13,8 @@ #include "db/version_edit.h" #include "port/stack_trace.h" #include "rocksdb/comparator.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/filename_test.cc b/db/filename_test.cc index 869469f3f..dabe673d8 100644 --- a/db/filename_test.cc +++ b/db/filename_test.cc @@ -12,7 +12,7 @@ #include "db/dbformat.h" #include "port/port.h" #include "util/logging.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/flush_job.cc b/db/flush_job.cc index 46915ca13..4930ecac7 100644 --- a/db/flush_job.cc +++ b/db/flush_job.cc @@ -51,7 +51,7 @@ #include "util/logging.h" #include "util/mutexlock.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/flush_job_test.cc b/db/flush_job_test.cc index 199ed29ca..d97ad9f0c 100644 --- a/db/flush_job_test.cc +++ b/db/flush_job_test.cc @@ -15,8 +15,8 @@ #include "table/mock_table.h" #include "util/file_reader_writer.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/forward_iterator.cc b/db/forward_iterator.cc index 94e448ee9..f95debec6 100644 --- a/db/forward_iterator.cc +++ b/db/forward_iterator.cc @@ -22,7 +22,7 @@ #include "rocksdb/slice_transform.h" #include "table/merging_iterator.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/forward_iterator_bench.cc b/db/forward_iterator_bench.cc index 113ded94b..9d6851dab 100644 --- a/db/forward_iterator_bench.cc +++ b/db/forward_iterator_bench.cc @@ -35,7 +35,7 @@ int main() { return 0; } #include "rocksdb/status.h" #include "rocksdb/table.h" #include "util/gflags_compat.h" -#include "util/testharness.h" +#include "test_util/testharness.h" const int MAX_SHARDS = 100000; diff --git a/db/listener_test.cc b/db/listener_test.cc index 6b716a1d4..663116b7b 100644 --- a/db/listener_test.cc +++ b/db/listener_test.cc @@ -29,9 +29,9 @@ #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 "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" #ifndef ROCKSDB_LITE diff --git a/db/log_test.cc b/db/log_test.cc index fd237b030..5b159acf2 100644 --- a/db/log_test.cc +++ b/db/log_test.cc @@ -14,8 +14,8 @@ #include "util/crc32c.h" #include "util/file_reader_writer.h" #include "util/random.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { namespace log { diff --git a/db/manual_compaction_test.cc b/db/manual_compaction_test.cc index 02732a555..35e5019ca 100644 --- a/db/manual_compaction_test.cc +++ b/db/manual_compaction_test.cc @@ -12,7 +12,7 @@ #include "rocksdb/compaction_filter.h" #include "rocksdb/slice.h" #include "rocksdb/write_batch.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "port/port.h" using namespace rocksdb; diff --git a/db/memtable_list.cc b/db/memtable_list.cc index bdcbd2186..b50b58a1a 100644 --- a/db/memtable_list.cc +++ b/db/memtable_list.cc @@ -24,7 +24,7 @@ #include "table/merging_iterator.h" #include "util/coding.h" #include "util/log_buffer.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/memtable_list_test.cc b/db/memtable_list_test.cc index a14c13b89..59da8af16 100644 --- a/db/memtable_list_test.cc +++ b/db/memtable_list_test.cc @@ -14,8 +14,8 @@ #include "rocksdb/status.h" #include "rocksdb/write_buffer_manager.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/merge_helper_test.cc b/db/merge_helper_test.cc index b61092ee5..dc3624af5 100644 --- a/db/merge_helper_test.cc +++ b/db/merge_helper_test.cc @@ -10,8 +10,8 @@ #include "db/merge_helper.h" #include "rocksdb/comparator.h" #include "util/coding.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/db/merge_test.cc b/db/merge_test.cc index 3bd4b9a60..d3dadaa5d 100644 --- a/db/merge_test.cc +++ b/db/merge_test.cc @@ -18,7 +18,7 @@ #include "db/db_impl.h" #include "db/write_batch_internal.h" #include "utilities/merge_operators.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc index 6bf2acf85..c6e7d6af0 100644 --- a/db/obsolete_files_test.cc +++ b/db/obsolete_files_test.cc @@ -21,9 +21,9 @@ #include "rocksdb/env.h" #include "rocksdb/transaction_log.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using std::cerr; using std::cout; diff --git a/db/options_file_test.cc b/db/options_file_test.cc index 0a9a34ff0..c7eba52c2 100644 --- a/db/options_file_test.cc +++ b/db/options_file_test.cc @@ -10,7 +10,7 @@ #include "db/db_test_util.h" #include "rocksdb/options.h" #include "rocksdb/table.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { class OptionsFileTest : public testing::Test { diff --git a/db/perf_context_test.cc b/db/perf_context_test.cc index b7efec182..42d592862 100644 --- a/db/perf_context_test.cc +++ b/db/perf_context_test.cc @@ -19,7 +19,7 @@ #include "rocksdb/slice_transform.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/merge_operators.h" bool FLAGS_random_key = false; diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc index ef770c2e5..7648ed85f 100644 --- a/db/plain_table_db_test.cc +++ b/db/plain_table_db_test.cc @@ -33,8 +33,8 @@ #include "util/logging.h" #include "util/mutexlock.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" using std::unique_ptr; diff --git a/db/prefix_test.cc b/db/prefix_test.cc index be420ded1..e8290e76b 100644 --- a/db/prefix_test.cc +++ b/db/prefix_test.cc @@ -31,7 +31,7 @@ int main() { #include "util/random.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/merge_operators.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; diff --git a/db/range_del_aggregator_bench.cc b/db/range_del_aggregator_bench.cc index 34b2f7e5d..54a86169b 100644 --- a/db/range_del_aggregator_bench.cc +++ b/db/range_del_aggregator_bench.cc @@ -26,7 +26,7 @@ int main() { #include "util/coding.h" #include "util/random.h" #include "util/stop_watch.h" -#include "util/testutil.h" +#include "test_util/testutil.h" #include "util/gflags_compat.h" diff --git a/db/range_del_aggregator_test.cc b/db/range_del_aggregator_test.cc index 28c8129ec..7ce666326 100644 --- a/db/range_del_aggregator_test.cc +++ b/db/range_del_aggregator_test.cc @@ -12,7 +12,7 @@ #include "db/db_test_util.h" #include "db/dbformat.h" #include "db/range_tombstone_fragmenter.h" -#include "util/testutil.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/range_tombstone_fragmenter_test.cc b/db/range_tombstone_fragmenter_test.cc index ddd3f7741..11f357496 100644 --- a/db/range_tombstone_fragmenter_test.cc +++ b/db/range_tombstone_fragmenter_test.cc @@ -7,7 +7,7 @@ #include "db/db_test_util.h" #include "rocksdb/comparator.h" -#include "util/testutil.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/table_cache.cc b/db/table_cache.cc index 01724dfc5..4efd3fdf7 100644 --- a/db/table_cache.cc +++ b/db/table_cache.cc @@ -25,7 +25,7 @@ #include "util/coding.h" #include "util/file_reader_writer.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/table_properties_collector_test.cc b/db/table_properties_collector_test.cc index ea561e982..6171b2938 100644 --- a/db/table_properties_collector_test.cc +++ b/db/table_properties_collector_test.cc @@ -20,8 +20,8 @@ #include "table/table_builder.h" #include "util/coding.h" #include "util/file_reader_writer.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/version_builder_test.cc b/db/version_builder_test.cc index 514952bb5..5c3bd686b 100644 --- a/db/version_builder_test.cc +++ b/db/version_builder_test.cc @@ -8,8 +8,8 @@ #include "db/version_set.h" #include "util/logging.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/version_edit.cc b/db/version_edit.cc index 01ec44515..018517a13 100644 --- a/db/version_edit.cc +++ b/db/version_edit.cc @@ -14,7 +14,7 @@ #include "util/coding.h" #include "util/event_logger.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/version_edit_test.cc b/db/version_edit_test.cc index 64d1fd77b..5f1ae98ba 100644 --- a/db/version_edit_test.cc +++ b/db/version_edit_test.cc @@ -9,8 +9,8 @@ #include "db/version_edit.h" #include "util/coding.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/version_set.cc b/db/version_set.cc index c10eb9f7a..b9616f373 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -52,7 +52,7 @@ #include "util/file_reader_writer.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "util/user_comparator_wrapper.h" namespace rocksdb { diff --git a/db/version_set_test.cc b/db/version_set_test.cc index 43924a3ad..41c27fdab 100644 --- a/db/version_set_test.cc +++ b/db/version_set_test.cc @@ -12,8 +12,8 @@ #include "table/mock_table.h" #include "util/logging.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/wal_manager.cc b/db/wal_manager.cc index cce714750..20b5780c8 100644 --- a/db/wal_manager.cc +++ b/db/wal_manager.cc @@ -34,7 +34,7 @@ #include "util/logging.h" #include "util/mutexlock.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/db/wal_manager_test.cc b/db/wal_manager_test.cc index 379f12f52..b1478e26e 100644 --- a/db/wal_manager_test.cc +++ b/db/wal_manager_test.cc @@ -21,8 +21,8 @@ #include "table/mock_table.h" #include "util/file_reader_writer.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc index 322bd8945..88c525229 100644 --- a/db/write_batch_test.cc +++ b/db/write_batch_test.cc @@ -19,7 +19,7 @@ #include "rocksdb/write_buffer_manager.h" #include "table/scoped_arena_iterator.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/write_callback_test.cc b/db/write_callback_test.cc index 7f2b20d89..dbb4759fa 100644 --- a/db/write_callback_test.cc +++ b/db/write_callback_test.cc @@ -17,8 +17,8 @@ #include "rocksdb/write_batch.h" #include "port/port.h" #include "util/random.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" using std::string; diff --git a/db/write_controller_test.cc b/db/write_controller_test.cc index 55feb00a3..919c2c118 100644 --- a/db/write_controller_test.cc +++ b/db/write_controller_test.cc @@ -8,7 +8,7 @@ #include "db/write_controller.h" #include "rocksdb/env.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/db/write_thread.cc b/db/write_thread.cc index 835992c8f..872d32ca8 100644 --- a/db/write_thread.cc +++ b/db/write_thread.cc @@ -10,7 +10,7 @@ #include "monitoring/perf_context_imp.h" #include "port/port.h" #include "util/random.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/env/env_basic_test.cc b/env/env_basic_test.cc index 93764d945..f306edbd6 100644 --- a/env/env_basic_test.cc +++ b/env/env_basic_test.cc @@ -12,7 +12,7 @@ #include "env/mock_env.h" #include "rocksdb/env.h" #include "rocksdb/utilities/object_registry.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/env/env_posix.cc b/env/env_posix.cc index 387c02793..3f75dd689 100644 --- a/env/env_posix.cc +++ b/env/env_posix.cc @@ -54,7 +54,7 @@ #include "util/logging.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "util/thread_local.h" #include "util/threadpool_imp.h" diff --git a/env/env_test.cc b/env/env_test.cc index 478009284..852a99c1a 100644 --- a/env/env_test.cc +++ b/env/env_test.cc @@ -44,9 +44,9 @@ #include "util/log_buffer.h" #include "util/mutexlock.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #ifdef OS_LINUX static const size_t kPageSize = sysconf(_SC_PAGESIZE); diff --git a/env/io_posix.cc b/env/io_posix.cc index 0ced06ff2..27198b1f9 100644 --- a/env/io_posix.cc +++ b/env/io_posix.cc @@ -33,7 +33,7 @@ #include "rocksdb/slice.h" #include "util/coding.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #if defined(OS_LINUX) && !defined(F_SET_RW_HINT) #define F_LINUX_SPECIFIC_BASE 1024 diff --git a/env/mock_env_test.cc b/env/mock_env_test.cc index 97c49b5f5..b21b953b5 100644 --- a/env/mock_env_test.cc +++ b/env/mock_env_test.cc @@ -10,7 +10,7 @@ #include #include "rocksdb/env.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/env/posix_logger.h b/env/posix_logger.h index 401df6a3f..8406a6d8a 100644 --- a/env/posix_logger.h +++ b/env/posix_logger.h @@ -27,7 +27,7 @@ #include "env/io_posix.h" #include "monitoring/iostats_context_imp.h" #include "rocksdb/env.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/file/delete_scheduler.cc b/file/delete_scheduler.cc index 41ec84376..44e3110d5 100644 --- a/file/delete_scheduler.cc +++ b/file/delete_scheduler.cc @@ -15,7 +15,7 @@ #include "rocksdb/env.h" #include "util/logging.h" #include "util/mutexlock.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/file/delete_scheduler_test.cc b/file/delete_scheduler_test.cc index c8544004c..122a5d617 100644 --- a/file/delete_scheduler_test.cc +++ b/file/delete_scheduler_test.cc @@ -17,9 +17,9 @@ #include "rocksdb/env.h" #include "rocksdb/options.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #ifndef ROCKSDB_LITE diff --git a/file/filename.cc b/file/filename.cc index 0a48dc78c..ed19b4109 100644 --- a/file/filename.cc +++ b/file/filename.cc @@ -21,7 +21,7 @@ #include "util/logging.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/file/sst_file_manager_impl.cc b/file/sst_file_manager_impl.cc index 86bcb2d19..9b7278c7d 100644 --- a/file/sst_file_manager_impl.cc +++ b/file/sst_file_manager_impl.cc @@ -17,7 +17,7 @@ #include "rocksdb/env.h" #include "rocksdb/sst_file_manager.h" #include "util/mutexlock.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/java/rocksjni/write_batch_test.cc b/java/rocksjni/write_batch_test.cc index 266fb4abf..9d5de9a2f 100644 --- a/java/rocksjni/write_batch_test.cc +++ b/java/rocksjni/write_batch_test.cc @@ -23,7 +23,7 @@ #include "rocksjni/portal.h" #include "table/scoped_arena_iterator.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" /* * Class: org_rocksdb_WriteBatchTest diff --git a/memtable/inlineskiplist_test.cc b/memtable/inlineskiplist_test.cc index b416ef7c5..a2f62d530 100644 --- a/memtable/inlineskiplist_test.cc +++ b/memtable/inlineskiplist_test.cc @@ -14,7 +14,7 @@ #include "util/concurrent_arena.h" #include "util/hash.h" #include "util/random.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/memtable/memtablerep_bench.cc b/memtable/memtablerep_bench.cc index 51ff11a01..ae1990965 100644 --- a/memtable/memtablerep_bench.cc +++ b/memtable/memtablerep_bench.cc @@ -39,7 +39,7 @@ int main() { #include "util/gflags_compat.h" #include "util/mutexlock.h" #include "util/stop_watch.h" -#include "util/testutil.h" +#include "test_util/testutil.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; using GFLAGS_NAMESPACE::RegisterFlagValidator; diff --git a/memtable/skiplist_test.cc b/memtable/skiplist_test.cc index 50c3588bb..054e3c9df 100644 --- a/memtable/skiplist_test.cc +++ b/memtable/skiplist_test.cc @@ -13,7 +13,7 @@ #include "util/arena.h" #include "util/hash.h" #include "util/random.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/memtable/write_buffer_manager_test.cc b/memtable/write_buffer_manager_test.cc index 3c89c8095..06514eabd 100644 --- a/memtable/write_buffer_manager_test.cc +++ b/memtable/write_buffer_manager_test.cc @@ -8,7 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "rocksdb/write_buffer_manager.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/monitoring/histogram_test.cc b/monitoring/histogram_test.cc index df58822fc..ed9a7bd32 100644 --- a/monitoring/histogram_test.cc +++ b/monitoring/histogram_test.cc @@ -7,7 +7,7 @@ #include "monitoring/histogram.h" #include "monitoring/histogram_windowing.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/monitoring/instrumented_mutex.cc b/monitoring/instrumented_mutex.cc index 7b61bcf4f..796bb26dd 100644 --- a/monitoring/instrumented_mutex.cc +++ b/monitoring/instrumented_mutex.cc @@ -6,7 +6,7 @@ #include "monitoring/instrumented_mutex.h" #include "monitoring/perf_context_imp.h" #include "monitoring/thread_status_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { namespace { diff --git a/monitoring/iostats_context_test.cc b/monitoring/iostats_context_test.cc index 74d3e4329..28d305d02 100644 --- a/monitoring/iostats_context_test.cc +++ b/monitoring/iostats_context_test.cc @@ -4,7 +4,7 @@ // (found in the LICENSE.Apache file in the root directory). #include "rocksdb/iostats_context.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/monitoring/statistics_test.cc b/monitoring/statistics_test.cc index a77022bfb..162afb264 100644 --- a/monitoring/statistics_test.cc +++ b/monitoring/statistics_test.cc @@ -5,8 +5,8 @@ // #include "port/stack_trace.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "rocksdb/statistics.h" diff --git a/options/options_parser.cc b/options/options_parser.cc index f09e53e4a..9ae3dfb27 100644 --- a/options/options_parser.cc +++ b/options/options_parser.cc @@ -19,7 +19,7 @@ #include "util/cast_util.h" #include "util/file_reader_writer.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "port/port.h" diff --git a/options/options_settable_test.cc b/options/options_settable_test.cc index 79a4fa814..2e21a2688 100644 --- a/options/options_settable_test.cc +++ b/options/options_settable_test.cc @@ -15,7 +15,7 @@ #include "options/options_helper.h" #include "rocksdb/convenience.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #ifndef GFLAGS bool FLAGS_enable_print = false; diff --git a/options/options_test.cc b/options/options_test.cc index ded336dd1..704b2db80 100644 --- a/options/options_test.cc +++ b/options/options_test.cc @@ -30,8 +30,8 @@ #include "util/random.h" #include "util/stderr_logger.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators/bytesxor.h" #ifndef GFLAGS diff --git a/port/win/env_default.cc b/port/win/env_default.cc index d24c21918..db64878bc 100644 --- a/port/win/env_default.cc +++ b/port/win/env_default.cc @@ -12,7 +12,7 @@ #include #include "port/win/env_win.h" #include "util/compression_context_cache.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "util/thread_local.h" namespace rocksdb { diff --git a/port/win/io_win.cc b/port/win/io_win.cc index 64ded8465..15d1e7114 100644 --- a/port/win/io_win.cc +++ b/port/win/io_win.cc @@ -12,7 +12,7 @@ #include "monitoring/iostats_context_imp.h" #include "util/aligned_buffer.h" #include "util/coding.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { namespace port { diff --git a/src.mk b/src.mk index 2541b9fd1..100b3355e 100644 --- a/src.mk +++ b/src.mk @@ -131,6 +131,9 @@ LIB_SOURCES = \ table/sst_file_writer.cc \ table/table_properties.cc \ table/two_level_iterator.cc \ + test_util/sync_point.cc \ + test_util/sync_point_impl.cc \ + test_util/transaction_test_util.cc \ tools/dump/db_dump_tool.cc \ util/arena.cc \ util/auto_roll_logger.cc \ @@ -156,12 +159,9 @@ LIB_SOURCES = \ util/slice.cc \ util/status.cc \ util/string_util.cc \ - util/sync_point.cc \ - util/sync_point_impl.cc \ util/thread_local.cc \ util/threadpool_imp.cc \ util/trace_replay.cc \ - util/transaction_test_util.cc \ util/xxhash.cc \ utilities/backupable/backupable_db.cc \ utilities/blob_db/blob_compaction_filter.cc \ @@ -242,15 +242,15 @@ ANALYZER_LIB_SOURCES = \ MOCK_LIB_SOURCES = \ table/mock_table.cc \ - util/fault_injection_test_env.cc + test_util/fault_injection_test_env.cc BENCH_LIB_SOURCES = \ tools/db_bench_tool.cc \ TEST_LIB_SOURCES = \ db/db_test_util.cc \ - util/testharness.cc \ - util/testutil.cc \ + test_util/testharness.cc \ + test_util/testutil.cc \ utilities/cassandra/test_utils.cc \ MAIN_SOURCES = \ diff --git a/table/block.h b/table/block.h index df4d4eb82..869d2f1f2 100644 --- a/table/block.h +++ b/table/block.h @@ -31,7 +31,7 @@ #include "table/data_block_hash_index.h" #include "table/internal_iterator.h" #include "util/random.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/table/block_based_filter_block_test.cc b/table/block_based_filter_block_test.cc index 6b352b2f6..2cb3abc27 100644 --- a/table/block_based_filter_block_test.cc +++ b/table/block_based_filter_block_test.cc @@ -13,8 +13,8 @@ #include "util/coding.h" #include "util/hash.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/block_based_table_reader.cc b/table/block_based_table_reader.cc index 34e409792..a45fc0a5b 100644 --- a/table/block_based_table_reader.cc +++ b/table/block_based_table_reader.cc @@ -51,7 +51,7 @@ #include "util/file_reader_writer.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "util/xxhash.h" namespace rocksdb { diff --git a/table/block_test.cc b/table/block_test.cc index 3e0ff3eab..d359b4e59 100644 --- a/table/block_test.cc +++ b/table/block_test.cc @@ -23,8 +23,8 @@ #include "table/block_builder.h" #include "table/format.h" #include "util/random.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/cleanable_test.cc b/table/cleanable_test.cc index f18c33b83..8478adf52 100644 --- a/table/cleanable_test.cc +++ b/table/cleanable_test.cc @@ -9,8 +9,8 @@ #include "port/stack_trace.h" #include "rocksdb/iostats_context.h" #include "rocksdb/perf_context.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/cuckoo_table_builder_test.cc b/table/cuckoo_table_builder_test.cc index c1e350327..eeba94805 100644 --- a/table/cuckoo_table_builder_test.cc +++ b/table/cuckoo_table_builder_test.cc @@ -13,8 +13,8 @@ #include "table/meta_blocks.h" #include "table/cuckoo_table_builder.h" #include "util/file_reader_writer.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { extern const uint64_t kCuckooTableMagicNumber; diff --git a/table/cuckoo_table_reader_test.cc b/table/cuckoo_table_reader_test.cc index 74fb52e6c..6d596f6e1 100644 --- a/table/cuckoo_table_reader_test.cc +++ b/table/cuckoo_table_reader_test.cc @@ -31,8 +31,8 @@ int main() { #include "util/gflags_compat.h" #include "util/random.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; using GFLAGS_NAMESPACE::SetUsageMessage; diff --git a/table/data_block_hash_index_test.cc b/table/data_block_hash_index_test.cc index 11226648e..0511b257a 100644 --- a/table/data_block_hash_index_test.cc +++ b/table/data_block_hash_index_test.cc @@ -15,8 +15,8 @@ #include "table/data_block_hash_index.h" #include "table/get_context.h" #include "table/table_builder.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/full_filter_block_test.cc b/table/full_filter_block_test.cc index 3abae979a..0ef5c5a97 100644 --- a/table/full_filter_block_test.cc +++ b/table/full_filter_block_test.cc @@ -10,8 +10,8 @@ #include "util/coding.h" #include "util/hash.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/merger_test.cc b/table/merger_test.cc index 1b04d0657..8efa2834d 100644 --- a/table/merger_test.cc +++ b/table/merger_test.cc @@ -7,8 +7,8 @@ #include #include "table/merging_iterator.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/merging_iterator.cc b/table/merging_iterator.cc index 244b5e82c..85a2fcc03 100644 --- a/table/merging_iterator.cc +++ b/table/merging_iterator.cc @@ -23,7 +23,7 @@ #include "util/autovector.h" #include "util/heap.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { // Without anonymous namespace here, we fail the warning -Wmissing-prototypes diff --git a/table/meta_blocks.cc b/table/meta_blocks.cc index 3f48095c5..98e05a4d0 100644 --- a/table/meta_blocks.cc +++ b/table/meta_blocks.cc @@ -18,7 +18,7 @@ #include "table/table_properties_internal.h" #include "util/coding.h" #include "util/file_reader_writer.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/table/mock_table.h b/table/mock_table.h index 5bca14644..f99941863 100644 --- a/table/mock_table.h +++ b/table/mock_table.h @@ -20,8 +20,8 @@ #include "table/table_builder.h" #include "table/table_reader.h" #include "util/mutexlock.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { namespace mock { diff --git a/table/partitioned_filter_block_test.cc b/table/partitioned_filter_block_test.cc index 8afa530d7..4bdc2fd36 100644 --- a/table/partitioned_filter_block_test.cc +++ b/table/partitioned_filter_block_test.cc @@ -13,8 +13,8 @@ #include "util/coding.h" #include "util/hash.h" #include "util/logging.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/table/sst_file_reader_test.cc b/table/sst_file_reader_test.cc index 51bc975af..529634ccd 100644 --- a/table/sst_file_reader_test.cc +++ b/table/sst_file_reader_test.cc @@ -11,8 +11,8 @@ #include "rocksdb/sst_file_reader.h" #include "rocksdb/sst_file_writer.h" #include "table/sst_file_writer_collectors.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/table/sst_file_writer.cc b/table/sst_file_writer.cc index b9a7273e0..71b395fd6 100644 --- a/table/sst_file_writer.cc +++ b/table/sst_file_writer.cc @@ -11,7 +11,7 @@ #include "table/block_based_table_builder.h" #include "table/sst_file_writer_collectors.h" #include "util/file_reader_writer.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/table/table_reader_bench.cc b/table/table_reader_bench.cc index a9b75715b..6b05d385e 100644 --- a/table/table_reader_bench.cc +++ b/table/table_reader_bench.cc @@ -24,8 +24,8 @@ int main() { #include "table/table_builder.h" #include "util/file_reader_writer.h" #include "util/gflags_compat.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; using GFLAGS_NAMESPACE::SetUsageMessage; diff --git a/table/table_test.cc b/table/table_test.cc index 7292ad7c3..dccc49194 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -49,9 +49,9 @@ #include "util/compression.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/util/fault_injection_test_env.cc b/test_util/fault_injection_test_env.cc similarity index 99% rename from util/fault_injection_test_env.cc rename to test_util/fault_injection_test_env.cc index 9cad23871..a591ff4b5 100644 --- a/util/fault_injection_test_env.cc +++ b/test_util/fault_injection_test_env.cc @@ -11,7 +11,7 @@ // the last "sync". It then checks for data loss errors by purposely dropping // file data (or entire files) not protected by a "sync". -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include #include diff --git a/util/fault_injection_test_env.h b/test_util/fault_injection_test_env.h similarity index 100% rename from util/fault_injection_test_env.h rename to test_util/fault_injection_test_env.h diff --git a/util/mock_time_env.h b/test_util/mock_time_env.h similarity index 100% rename from util/mock_time_env.h rename to test_util/mock_time_env.h diff --git a/util/sync_point.cc b/test_util/sync_point.cc similarity index 95% rename from util/sync_point.cc rename to test_util/sync_point.cc index 4599c256d..a09be9e8f 100644 --- a/util/sync_point.cc +++ b/test_util/sync_point.cc @@ -3,8 +3,8 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "util/sync_point.h" -#include "util/sync_point_impl.h" +#include "test_util/sync_point.h" +#include "test_util/sync_point_impl.h" int rocksdb_kill_odds = 0; std::vector rocksdb_kill_prefix_blacklist; diff --git a/util/sync_point.h b/test_util/sync_point.h similarity index 100% rename from util/sync_point.h rename to test_util/sync_point.h diff --git a/util/sync_point_impl.cc b/test_util/sync_point_impl.cc similarity index 98% rename from util/sync_point_impl.cc rename to test_util/sync_point_impl.cc index 248c381a3..db44f472a 100644 --- a/util/sync_point_impl.cc +++ b/test_util/sync_point_impl.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "util/sync_point_impl.h" +#include "test_util/sync_point_impl.h" #ifndef NDEBUG namespace rocksdb { diff --git a/util/sync_point_impl.h b/test_util/sync_point_impl.h similarity index 98% rename from util/sync_point_impl.h rename to test_util/sync_point_impl.h index 3c7e70491..d96d73257 100644 --- a/util/sync_point_impl.h +++ b/test_util/sync_point_impl.h @@ -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/sync_point.h" +#include "test_util/sync_point.h" #include #include diff --git a/util/testharness.cc b/test_util/testharness.cc similarity index 97% rename from util/testharness.cc rename to test_util/testharness.cc index 8f5eb2a4d..62cc535a1 100644 --- a/util/testharness.cc +++ b/test_util/testharness.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/testharness.h" +#include "test_util/testharness.h" #include #include diff --git a/util/testharness.h b/test_util/testharness.h similarity index 100% rename from util/testharness.h rename to test_util/testharness.h diff --git a/util/testutil.cc b/test_util/testutil.cc similarity index 99% rename from util/testutil.cc rename to test_util/testutil.cc index b6493258f..18e1a45bb 100644 --- a/util/testutil.cc +++ b/test_util/testutil.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/testutil.h" +#include "test_util/testutil.h" #include #include diff --git a/util/testutil.h b/test_util/testutil.h similarity index 100% rename from util/testutil.h rename to test_util/testutil.h diff --git a/util/transaction_test_util.cc b/test_util/transaction_test_util.cc similarity index 99% rename from util/transaction_test_util.cc rename to test_util/transaction_test_util.cc index bd2d6afdc..14d390651 100644 --- a/util/transaction_test_util.cc +++ b/test_util/transaction_test_util.cc @@ -8,7 +8,7 @@ #define __STDC_FORMAT_MACROS #endif -#include "util/transaction_test_util.h" +#include "test_util/transaction_test_util.h" #include #include diff --git a/util/transaction_test_util.h b/test_util/transaction_test_util.h similarity index 100% rename from util/transaction_test_util.h rename to test_util/transaction_test_util.h diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc index 2ceca4fd9..12caa2809 100644 --- a/tools/db_bench_tool.cc +++ b/tools/db_bench_tool.cc @@ -68,8 +68,8 @@ #include "util/random.h" #include "util/stderr_logger.h" #include "util/string_util.h" -#include "util/testutil.h" -#include "util/transaction_test_util.h" +#include "test_util/testutil.h" +#include "test_util/transaction_test_util.h" #include "util/xxhash.h" #include "utilities/blob_db/blob_db.h" #include "utilities/merge_operators.h" diff --git a/tools/db_bench_tool_test.cc b/tools/db_bench_tool_test.cc index 1b19de5f1..52a1f9b91 100644 --- a/tools/db_bench_tool_test.cc +++ b/tools/db_bench_tool_test.cc @@ -11,8 +11,8 @@ #include "options/options_parser.h" #include "rocksdb/utilities/options_util.h" #include "util/random.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #ifdef GFLAGS #include "util/gflags_compat.h" diff --git a/tools/db_repl_stress.cc b/tools/db_repl_stress.cc index c640b5945..41ae4c276 100644 --- a/tools/db_repl_stress.cc +++ b/tools/db_repl_stress.cc @@ -19,7 +19,7 @@ int main() { #include "rocksdb/db.h" #include "rocksdb/types.h" #include "util/gflags_compat.h" -#include "util/testutil.h" +#include "test_util/testutil.h" // Run a thread to perform Put's. // Another thread uses GetUpdatesSince API to keep getting the updates. diff --git a/tools/db_stress.cc b/tools/db_stress.cc index 579178eff..72461b13a 100644 --- a/tools/db_stress.cc +++ b/tools/db_stress.cc @@ -72,9 +72,9 @@ int main() { #include "util/string_util.h" // SyncPoint is not supported in Released Windows Mode. #if !(defined NDEBUG) || !defined(OS_WIN) -#include "util/sync_point.h" +#include "test_util/sync_point.h" #endif // !(defined NDEBUG) || !defined(OS_WIN) -#include "util/testutil.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" diff --git a/tools/ldb_cmd_test.cc b/tools/ldb_cmd_test.cc index 3b7099533..24622b7cc 100644 --- a/tools/ldb_cmd_test.cc +++ b/tools/ldb_cmd_test.cc @@ -6,7 +6,7 @@ #ifndef ROCKSDB_LITE #include "rocksdb/utilities/ldb_cmd.h" -#include "util/testharness.h" +#include "test_util/testharness.h" using std::string; using std::vector; diff --git a/tools/reduce_levels_test.cc b/tools/reduce_levels_test.cc index 1718b3344..a76416b6c 100644 --- a/tools/reduce_levels_test.cc +++ b/tools/reduce_levels_test.cc @@ -12,8 +12,8 @@ #include "rocksdb/utilities/ldb_cmd.h" #include "tools/ldb_cmd_impl.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/tools/sst_dump_test.cc b/tools/sst_dump_test.cc index 6bf3e3b97..a2c226b92 100644 --- a/tools/sst_dump_test.cc +++ b/tools/sst_dump_test.cc @@ -16,8 +16,8 @@ #include "table/block_based_table_factory.h" #include "table/table_builder.h" #include "util/file_reader_writer.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/tools/trace_analyzer_test.cc b/tools/trace_analyzer_test.cc index b2cc777d5..2f31c5d82 100644 --- a/tools/trace_analyzer_test.cc +++ b/tools/trace_analyzer_test.cc @@ -28,8 +28,8 @@ int main() { #include "rocksdb/status.h" #include "rocksdb/trace_reader_writer.h" #include "tools/trace_analyzer_tool.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "util/trace_replay.h" namespace rocksdb { diff --git a/util/arena.cc b/util/arena.cc index d7799eb26..67e8a4db7 100644 --- a/util/arena.cc +++ b/util/arena.cc @@ -22,7 +22,7 @@ #include "port/port.h" #include "rocksdb/env.h" #include "util/logging.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/util/arena_test.cc b/util/arena_test.cc index 9dfc28ab2..052f2a6d5 100644 --- a/util/arena_test.cc +++ b/util/arena_test.cc @@ -9,7 +9,7 @@ #include "util/arena.h" #include "util/random.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/util/auto_roll_logger.h b/util/auto_roll_logger.h index 24f4714b4..5a2049b64 100644 --- a/util/auto_roll_logger.h +++ b/util/auto_roll_logger.h @@ -14,7 +14,7 @@ #include "port/port.h" #include "port/util_logger.h" #include "util/mutexlock.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/util/auto_roll_logger_test.cc b/util/auto_roll_logger_test.cc index ab9e05958..3adbdbb13 100644 --- a/util/auto_roll_logger_test.cc +++ b/util/auto_roll_logger_test.cc @@ -20,8 +20,8 @@ #include "port/port.h" #include "rocksdb/db.h" #include "util/logging.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" namespace rocksdb { namespace { diff --git a/util/autovector_test.cc b/util/autovector_test.cc index 13299669c..edb7af9ea 100644 --- a/util/autovector_test.cc +++ b/util/autovector_test.cc @@ -11,8 +11,8 @@ #include "rocksdb/env.h" #include "util/autovector.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using std::cout; using std::endl; diff --git a/util/bloom_test.cc b/util/bloom_test.cc index 4b25e9b6c..87cd9da55 100644 --- a/util/bloom_test.cc +++ b/util/bloom_test.cc @@ -22,8 +22,8 @@ int main() { #include "util/arena.h" #include "util/gflags_compat.h" #include "util/logging.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; diff --git a/util/coding_test.cc b/util/coding_test.cc index f7b1671d1..7f73e00e1 100644 --- a/util/coding_test.cc +++ b/util/coding_test.cc @@ -9,7 +9,7 @@ #include "util/coding.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/util/crc32c_test.cc b/util/crc32c_test.cc index d5983586b..90f0c815c 100644 --- a/util/crc32c_test.cc +++ b/util/crc32c_test.cc @@ -7,7 +7,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "util/crc32c.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "util/coding.h" namespace rocksdb { diff --git a/util/dynamic_bloom_test.cc b/util/dynamic_bloom_test.cc index 4244bff1a..a8a7000f6 100644 --- a/util/dynamic_bloom_test.cc +++ b/util/dynamic_bloom_test.cc @@ -29,8 +29,8 @@ int main() { #include "util/gflags_compat.h" #include "util/logging.h" #include "util/stop_watch.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; diff --git a/util/event_logger_test.cc b/util/event_logger_test.cc index 4bcf30ff5..16c6c59f7 100644 --- a/util/event_logger_test.cc +++ b/util/event_logger_test.cc @@ -6,7 +6,7 @@ #include #include "util/event_logger.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/util/file_reader_writer.cc b/util/file_reader_writer.cc index 9a818cb0f..3003a1eba 100644 --- a/util/file_reader_writer.cc +++ b/util/file_reader_writer.cc @@ -17,7 +17,7 @@ #include "port/port.h" #include "util/random.h" #include "util/rate_limiter.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/util/file_reader_writer.h b/util/file_reader_writer.h index 1ef23e8c9..317c1d6c7 100644 --- a/util/file_reader_writer.h +++ b/util/file_reader_writer.h @@ -16,7 +16,7 @@ #include "rocksdb/listener.h" #include "rocksdb/rate_limiter.h" #include "util/aligned_buffer.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/util/file_reader_writer_test.cc b/util/file_reader_writer_test.cc index 6a7ea6d7d..18bb65a72 100644 --- a/util/file_reader_writer_test.cc +++ b/util/file_reader_writer_test.cc @@ -7,8 +7,8 @@ #include #include #include "util/random.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/util/filelock_test.cc b/util/filelock_test.cc index f8721b590..bd0fc7c42 100644 --- a/util/filelock_test.cc +++ b/util/filelock_test.cc @@ -9,7 +9,7 @@ #include #include #include "util/coding.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/util/hash_test.cc b/util/hash_test.cc index 959e8cd0f..6618c5a4b 100644 --- a/util/hash_test.cc +++ b/util/hash_test.cc @@ -10,7 +10,7 @@ #include #include "util/hash.h" -#include "util/testharness.h" +#include "test_util/testharness.h" // The hash algorithm is part of the file format, for example for the Bloom // filters. Test that the hash values are stable for a set of random strings of diff --git a/util/log_write_bench.cc b/util/log_write_bench.cc index 5c9b3e84b..dd5322151 100644 --- a/util/log_write_bench.cc +++ b/util/log_write_bench.cc @@ -15,8 +15,8 @@ int main() { #include "rocksdb/env.h" #include "util/file_reader_writer.h" #include "util/gflags_compat.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; using GFLAGS_NAMESPACE::SetUsageMessage; diff --git a/util/rate_limiter.cc b/util/rate_limiter.cc index 9d23c38f7..93665837f 100644 --- a/util/rate_limiter.cc +++ b/util/rate_limiter.cc @@ -12,7 +12,7 @@ #include "port/port.h" #include "rocksdb/env.h" #include "util/aligned_buffer.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/util/rate_limiter_test.cc b/util/rate_limiter_test.cc index d3f3be3ba..3316a75b5 100644 --- a/util/rate_limiter_test.cc +++ b/util/rate_limiter_test.cc @@ -20,8 +20,8 @@ #include "db/db_test_util.h" #include "rocksdb/env.h" #include "util/random.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/util/repeatable_thread.h b/util/repeatable_thread.h index 2d4729da0..4226f3539 100644 --- a/util/repeatable_thread.h +++ b/util/repeatable_thread.h @@ -10,7 +10,7 @@ #include "port/port.h" #include "rocksdb/env.h" -#include "util/mock_time_env.h" +#include "test_util/mock_time_env.h" #include "util/mutexlock.h" namespace rocksdb { diff --git a/util/repeatable_thread_test.cc b/util/repeatable_thread_test.cc index ee853c105..29af340d7 100644 --- a/util/repeatable_thread_test.cc +++ b/util/repeatable_thread_test.cc @@ -8,8 +8,8 @@ #include "db/db_test_util.h" #include "util/repeatable_thread.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" class RepeatableThreadTest : public testing::Test { public: diff --git a/util/slice_transform_test.cc b/util/slice_transform_test.cc index f91675cce..96d90a9cd 100644 --- a/util/slice_transform_test.cc +++ b/util/slice_transform_test.cc @@ -14,7 +14,7 @@ #include "rocksdb/filter_policy.h" #include "rocksdb/statistics.h" #include "rocksdb/table.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/util/thread_list_test.cc b/util/thread_list_test.cc index a4a343a9c..37f59bab8 100644 --- a/util/thread_list_test.cc +++ b/util/thread_list_test.cc @@ -8,7 +8,7 @@ #include "monitoring/thread_status_updater.h" #include "rocksdb/db.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #ifdef ROCKSDB_USING_THREAD_STATUS diff --git a/util/thread_local_test.cc b/util/thread_local_test.cc index 789be83d8..787638138 100644 --- a/util/thread_local_test.cc +++ b/util/thread_local_test.cc @@ -10,9 +10,9 @@ #include "rocksdb/env.h" #include "port/port.h" #include "util/autovector.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "util/thread_local.h" namespace rocksdb { diff --git a/util/timer_queue.h b/util/timer_queue.h index bd8a4f850..a5f74ae56 100644 --- a/util/timer_queue.h +++ b/util/timer_queue.h @@ -32,7 +32,7 @@ #include #include "port/port.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" // Allows execution of handlers at a specified time in the future // Guarantees: diff --git a/utilities/backupable/backupable_db.cc b/utilities/backupable/backupable_db.cc index 149eb911f..816c9718b 100644 --- a/utilities/backupable/backupable_db.cc +++ b/utilities/backupable/backupable_db.cc @@ -20,7 +20,7 @@ #include "util/file_reader_writer.h" #include "util/logging.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "utilities/checkpoint/checkpoint_impl.h" #ifndef __STDC_FORMAT_MACROS diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc index e4abd96e9..c7377064f 100644 --- a/utilities/backupable/backupable_db_test.cc +++ b/utilities/backupable/backupable_db_test.cc @@ -27,9 +27,9 @@ #include "util/random.h" #include "util/stderr_logger.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc index 9f3839370..54eb3f2db 100644 --- a/utilities/blob_db/blob_db_impl.cc +++ b/utilities/blob_db/blob_db_impl.cc @@ -33,7 +33,7 @@ #include "util/mutexlock.h" #include "util/random.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "util/timer_queue.h" #include "utilities/blob_db/blob_compaction_filter.h" #include "utilities/blob_db/blob_db_iterator.h" diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc index e24ba1d98..19dce3f87 100644 --- a/utilities/blob_db/blob_db_test.cc +++ b/utilities/blob_db/blob_db_test.cc @@ -19,11 +19,11 @@ #include "port/port.h" #include "rocksdb/utilities/debug.h" #include "util/cast_util.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" #include "utilities/blob_db/blob_db.h" #include "utilities/blob_db/blob_db_impl.h" #include "utilities/blob_db/blob_index.h" diff --git a/utilities/cassandra/cassandra_format_test.cc b/utilities/cassandra/cassandra_format_test.cc index 8f9baa723..7af21247e 100644 --- a/utilities/cassandra/cassandra_format_test.cc +++ b/utilities/cassandra/cassandra_format_test.cc @@ -5,7 +5,7 @@ #include #include -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/cassandra/format.h" #include "utilities/cassandra/serialize.h" #include "utilities/cassandra/test_utils.h" diff --git a/utilities/cassandra/cassandra_functional_test.cc b/utilities/cassandra/cassandra_functional_test.cc index dacc6f03c..347846d07 100644 --- a/utilities/cassandra/cassandra_functional_test.cc +++ b/utilities/cassandra/cassandra_functional_test.cc @@ -8,7 +8,7 @@ #include "db/db_impl.h" #include "rocksdb/merge_operator.h" #include "rocksdb/utilities/db_ttl.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "util/random.h" #include "utilities/merge_operators.h" #include "utilities/cassandra/cassandra_compaction_filter.h" diff --git a/utilities/cassandra/cassandra_row_merge_test.cc b/utilities/cassandra/cassandra_row_merge_test.cc index 8d6dc10de..88dee118b 100644 --- a/utilities/cassandra/cassandra_row_merge_test.cc +++ b/utilities/cassandra/cassandra_row_merge_test.cc @@ -4,7 +4,7 @@ // (found in the LICENSE.Apache file in the root directory). #include -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/cassandra/format.h" #include "utilities/cassandra/test_utils.h" diff --git a/utilities/cassandra/cassandra_serialize_test.cc b/utilities/cassandra/cassandra_serialize_test.cc index 68d2c163d..bfce2a36e 100644 --- a/utilities/cassandra/cassandra_serialize_test.cc +++ b/utilities/cassandra/cassandra_serialize_test.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/cassandra/serialize.h" using namespace rocksdb::cassandra; diff --git a/utilities/cassandra/format.h b/utilities/cassandra/format.h index 09a492356..562c1aff3 100644 --- a/utilities/cassandra/format.h +++ b/utilities/cassandra/format.h @@ -60,7 +60,7 @@ #include #include "rocksdb/merge_operator.h" #include "rocksdb/slice.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { namespace cassandra { diff --git a/utilities/cassandra/test_utils.h b/utilities/cassandra/test_utils.h index 80374b0cb..f58bd7300 100644 --- a/utilities/cassandra/test_utils.h +++ b/utilities/cassandra/test_utils.h @@ -5,7 +5,7 @@ #pragma once #include -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/cassandra/format.h" #include "utilities/cassandra/serialize.h" diff --git a/utilities/checkpoint/checkpoint_impl.cc b/utilities/checkpoint/checkpoint_impl.cc index 920f9bf53..7468c8eed 100644 --- a/utilities/checkpoint/checkpoint_impl.cc +++ b/utilities/checkpoint/checkpoint_impl.cc @@ -28,7 +28,7 @@ #include "rocksdb/env.h" #include "rocksdb/transaction_log.h" #include "rocksdb/utilities/checkpoint.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" namespace rocksdb { diff --git a/utilities/checkpoint/checkpoint_test.cc b/utilities/checkpoint/checkpoint_test.cc index 9318a733d..da2972aff 100644 --- a/utilities/checkpoint/checkpoint_test.cc +++ b/utilities/checkpoint/checkpoint_test.cc @@ -23,9 +23,9 @@ #include "rocksdb/env.h" #include "rocksdb/utilities/checkpoint.h" #include "rocksdb/utilities/transaction_db.h" -#include "util/fault_injection_test_env.h" -#include "util/sync_point.h" -#include "util/testharness.h" +#include "test_util/fault_injection_test_env.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" namespace rocksdb { class CheckpointTest : public testing::Test { diff --git a/utilities/env_librados_test.cc b/utilities/env_librados_test.cc index 1a3746860..e5f918945 100644 --- a/utilities/env_librados_test.cc +++ b/utilities/env_librados_test.cc @@ -9,7 +9,7 @@ #include "rocksdb/utilities/env_librados.h" #include #include "env/mock_env.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "rocksdb/db.h" #include "rocksdb/slice.h" diff --git a/utilities/env_mirror_test.cc b/utilities/env_mirror_test.cc index 3c0ed2285..6b20f1f13 100644 --- a/utilities/env_mirror_test.cc +++ b/utilities/env_mirror_test.cc @@ -8,7 +8,7 @@ #include "rocksdb/utilities/env_mirror.h" #include "env/mock_env.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/utilities/env_timed_test.cc b/utilities/env_timed_test.cc index 8bdef6396..989c79a39 100644 --- a/utilities/env_timed_test.cc +++ b/utilities/env_timed_test.cc @@ -7,7 +7,7 @@ #include "rocksdb/env.h" #include "rocksdb/perf_context.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/utilities/memory/memory_test.cc b/utilities/memory/memory_test.cc index 8d976ef92..c3ff64081 100644 --- a/utilities/memory/memory_test.cc +++ b/utilities/memory/memory_test.cc @@ -12,8 +12,8 @@ #include "rocksdb/utilities/stackable_db.h" #include "table/block_based_table_factory.h" #include "util/string_util.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" namespace rocksdb { diff --git a/utilities/merge_operators/string_append/stringappend_test.cc b/utilities/merge_operators/string_append/stringappend_test.cc index 54c89a03a..160bd347b 100644 --- a/utilities/merge_operators/string_append/stringappend_test.cc +++ b/utilities/merge_operators/string_append/stringappend_test.cc @@ -15,7 +15,7 @@ #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend.h" #include "utilities/merge_operators/string_append/stringappend2.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "util/random.h" using namespace rocksdb; diff --git a/utilities/object_registry_test.cc b/utilities/object_registry_test.cc index 4444d8712..cc7c38d8a 100644 --- a/utilities/object_registry_test.cc +++ b/utilities/object_registry_test.cc @@ -6,7 +6,7 @@ #ifndef ROCKSDB_LITE #include "rocksdb/utilities/object_registry.h" -#include "util/testharness.h" +#include "test_util/testharness.h" namespace rocksdb { diff --git a/utilities/options/options_util_test.cc b/utilities/options/options_util_test.cc index ed7bfdfd6..342db4902 100644 --- a/utilities/options/options_util_test.cc +++ b/utilities/options/options_util_test.cc @@ -18,8 +18,8 @@ #include "rocksdb/table.h" #include "rocksdb/utilities/options_util.h" #include "util/random.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #ifndef GFLAGS bool FLAGS_enable_print = false; diff --git a/utilities/persistent_cache/block_cache_tier.cc b/utilities/persistent_cache/block_cache_tier.cc index f7f72df6d..775ef29cf 100644 --- a/utilities/persistent_cache/block_cache_tier.cc +++ b/utilities/persistent_cache/block_cache_tier.cc @@ -13,7 +13,7 @@ #include "port/port.h" #include "util/logging.h" #include "util/stop_watch.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "utilities/persistent_cache/block_cache_tier_file.h" namespace rocksdb { diff --git a/utilities/persistent_cache/hash_table_test.cc b/utilities/persistent_cache/hash_table_test.cc index d6ff3e68e..51ad211e9 100644 --- a/utilities/persistent_cache/hash_table_test.cc +++ b/utilities/persistent_cache/hash_table_test.cc @@ -11,7 +11,7 @@ #include "db/db_test_util.h" #include "util/arena.h" #include "util/random.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/persistent_cache/hash_table.h" #include "utilities/persistent_cache/hash_table_evictable.h" diff --git a/utilities/persistent_cache/persistent_cache_test.h b/utilities/persistent_cache/persistent_cache_test.h index ad99ea864..33cda4ea7 100644 --- a/utilities/persistent_cache/persistent_cache_test.h +++ b/utilities/persistent_cache/persistent_cache_test.h @@ -23,7 +23,7 @@ #include "table/block_builder.h" #include "port/port.h" #include "util/arena.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/persistent_cache/volatile_tier_impl.h" namespace rocksdb { diff --git a/utilities/transactions/optimistic_transaction_test.cc b/utilities/transactions/optimistic_transaction_test.cc index fbb0d44fd..e3105a213 100644 --- a/utilities/transactions/optimistic_transaction_test.cc +++ b/utilities/transactions/optimistic_transaction_test.cc @@ -15,8 +15,8 @@ #include "util/crc32c.h" #include "util/logging.h" #include "util/random.h" -#include "util/testharness.h" -#include "util/transaction_test_util.h" +#include "test_util/testharness.h" +#include "test_util/transaction_test_util.h" #include "port/port.h" using std::string; diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index d0e4f2046..fd9da17aa 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -21,7 +21,7 @@ #include "rocksdb/utilities/transaction_db.h" #include "util/cast_util.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "utilities/transactions/pessimistic_transaction_db.h" #include "utilities/transactions/transaction_util.h" diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index c1b37c148..95c88594c 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -22,7 +22,7 @@ #include "rocksdb/utilities/transaction_db.h" #include "util/cast_util.h" #include "util/mutexlock.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "utilities/transactions/pessimistic_transaction.h" #include "utilities/transactions/transaction_db_mutex_impl.h" #include "utilities/transactions/write_prepared_txn_db.h" diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 48d496bfd..173e012d8 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -25,7 +25,7 @@ #include "rocksdb/utilities/transaction_db_mutex.h" #include "util/cast_util.h" #include "util/hash.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "util/thread_local.h" #include "utilities/transactions/pessimistic_transaction_db.h" diff --git a/utilities/transactions/transaction_test.cc b/utilities/transactions/transaction_test.cc index 3c8036614..d183401f4 100644 --- a/utilities/transactions/transaction_test.cc +++ b/utilities/transactions/transaction_test.cc @@ -23,13 +23,13 @@ #include "rocksdb/utilities/transaction.h" #include "rocksdb/utilities/transaction_db.h" #include "table/mock_table.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" -#include "util/transaction_test_util.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" +#include "test_util/transaction_test_util.h" #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend.h" #include "utilities/transactions/pessimistic_transaction_db.h" diff --git a/utilities/transactions/transaction_test.h b/utilities/transactions/transaction_test.h index 2e3b99527..8dfa6b053 100644 --- a/utilities/transactions/transaction_test.h +++ b/utilities/transactions/transaction_test.h @@ -21,13 +21,13 @@ #include "rocksdb/utilities/transaction.h" #include "rocksdb/utilities/transaction_db.h" #include "table/mock_table.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" -#include "util/transaction_test_util.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" +#include "test_util/transaction_test_util.h" #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend.h" #include "utilities/transactions/pessimistic_transaction_db.h" diff --git a/utilities/transactions/write_prepared_transaction_test.cc b/utilities/transactions/write_prepared_transaction_test.cc index 7b5a585df..5287cca20 100644 --- a/utilities/transactions/write_prepared_transaction_test.cc +++ b/utilities/transactions/write_prepared_transaction_test.cc @@ -27,14 +27,14 @@ #include "rocksdb/utilities/transaction.h" #include "rocksdb/utilities/transaction_db.h" #include "table/mock_table.h" -#include "util/fault_injection_test_env.h" +#include "test_util/fault_injection_test_env.h" #include "util/mutexlock.h" #include "util/random.h" #include "util/string_util.h" -#include "util/sync_point.h" -#include "util/testharness.h" -#include "util/testutil.h" -#include "util/transaction_test_util.h" +#include "test_util/sync_point.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" +#include "test_util/transaction_test_util.h" #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend.h" #include "utilities/transactions/pessimistic_transaction_db.h" diff --git a/utilities/transactions/write_prepared_txn_db.cc b/utilities/transactions/write_prepared_txn_db.cc index 5250f3f2d..0508a596e 100644 --- a/utilities/transactions/write_prepared_txn_db.cc +++ b/utilities/transactions/write_prepared_txn_db.cc @@ -24,7 +24,7 @@ #include "util/cast_util.h" #include "util/mutexlock.h" #include "util/string_util.h" -#include "util/sync_point.h" +#include "test_util/sync_point.h" #include "utilities/transactions/pessimistic_transaction.h" #include "utilities/transactions/transaction_db_mutex_impl.h" diff --git a/utilities/ttl/ttl_test.cc b/utilities/ttl/ttl_test.cc index 88e90af26..c7d8f52aa 100644 --- a/utilities/ttl/ttl_test.cc +++ b/utilities/ttl/ttl_test.cc @@ -10,7 +10,7 @@ #include "rocksdb/compaction_filter.h" #include "rocksdb/utilities/db_ttl.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #ifndef OS_WIN #include #endif diff --git a/utilities/util_merge_operators_test.cc b/utilities/util_merge_operators_test.cc index d8b3cfba6..d591ac8f1 100644 --- a/utilities/util_merge_operators_test.cc +++ b/utilities/util_merge_operators_test.cc @@ -3,8 +3,8 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "util/testharness.h" -#include "util/testutil.h" +#include "test_util/testharness.h" +#include "test_util/testutil.h" #include "utilities/merge_operators.h" namespace rocksdb { diff --git a/utilities/write_batch_with_index/write_batch_with_index_test.cc b/utilities/write_batch_with_index/write_batch_with_index_test.cc index be715fe32..f8875d9ac 100644 --- a/utilities/write_batch_with_index/write_batch_with_index_test.cc +++ b/utilities/write_batch_with_index/write_batch_with_index_test.cc @@ -16,7 +16,7 @@ #include "rocksdb/utilities/write_batch_with_index.h" #include "util/random.h" #include "util/string_util.h" -#include "util/testharness.h" +#include "test_util/testharness.h" #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend.h"