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
This commit is contained in:
Siying Dong 2019-05-30 11:21:38 -07:00 committed by Facebook Github Bot
parent a984040f0b
commit e9e0101ca4
203 changed files with 322 additions and 322 deletions

View File

@ -600,6 +600,10 @@ set(SOURCES
table/sst_file_writer.cc table/sst_file_writer.cc
table/table_properties.cc table/table_properties.cc
table/two_level_iterator.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/db_bench_tool.cc
tools/dump/db_dump_tool.cc tools/dump/db_dump_tool.cc
tools/ldb_cmd.cc tools/ldb_cmd.cc
@ -629,13 +633,9 @@ set(SOURCES
util/slice.cc util/slice.cc
util/status.cc util/status.cc
util/string_util.cc util/string_util.cc
util/sync_point.cc
util/sync_point_impl.cc
util/testutil.cc
util/thread_local.cc util/thread_local.cc
util/threadpool_imp.cc util/threadpool_imp.cc
util/trace_replay.cc util/trace_replay.cc
util/transaction_test_util.cc
util/xxhash.cc util/xxhash.cc
utilities/backupable/backupable_db.cc utilities/backupable/backupable_db.cc
utilities/blob_db/blob_compaction_filter.cc utilities/blob_db/blob_compaction_filter.cc
@ -1006,7 +1006,7 @@ if(WITH_TESTS)
tools/db_bench.cc tools/db_bench.cc
table/table_reader_bench.cc table/table_reader_bench.cc
utilities/persistent_cache/hash_table_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}) foreach(sourcefile ${BENCHMARKS})
get_filename_component(exename ${sourcefile} NAME_WE) get_filename_component(exename ${sourcefile} NAME_WE)
add_executable(${exename}${ARTIFACT_SUFFIX} ${sourcefile} add_executable(${exename}${ARTIFACT_SUFFIX} ${sourcefile}
@ -1020,7 +1020,7 @@ if(WITH_TESTS)
db/db_test_util.cc db/db_test_util.cc
monitoring/thread_status_updater_debug.cc monitoring/thread_status_updater_debug.cc
table/mock_table.cc table/mock_table.cc
util/fault_injection_test_env.cc test_util/fault_injection_test_env.cc
utilities/cassandra/test_utils.cc utilities/cassandra/test_utils.cc
) )
# test utilities are only build in debug # test utilities are only build in debug

View File

@ -404,8 +404,8 @@ LIBOBJECTS += $(TOOL_LIB_SOURCES:.cc=.o)
MOCKOBJECTS = $(MOCK_LIB_SOURCES:.cc=.o) MOCKOBJECTS = $(MOCK_LIB_SOURCES:.cc=.o)
GTEST = $(GTEST_DIR)/gtest/gtest-all.o GTEST = $(GTEST_DIR)/gtest/gtest-all.o
TESTUTIL = ./util/testutil.o TESTUTIL = ./test_util/testutil.o
TESTHARNESS = ./util/testharness.o $(TESTUTIL) $(MOCKOBJECTS) $(GTEST) TESTHARNESS = ./test_util/testharness.o $(TESTUTIL) $(MOCKOBJECTS) $(GTEST)
VALGRIND_ERROR = 2 VALGRIND_ERROR = 2
VALGRIND_VER := $(join $(VALGRIND_VER),valgrind) VALGRIND_VER := $(join $(VALGRIND_VER),valgrind)

14
TARGETS
View File

@ -207,6 +207,9 @@ cpp_library(
"table/sst_file_writer.cc", "table/sst_file_writer.cc",
"table/table_properties.cc", "table/table_properties.cc",
"table/two_level_iterator.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/dump/db_dump_tool.cc",
"tools/ldb_cmd.cc", "tools/ldb_cmd.cc",
"tools/ldb_tool.cc", "tools/ldb_tool.cc",
@ -235,12 +238,9 @@ cpp_library(
"util/slice.cc", "util/slice.cc",
"util/status.cc", "util/status.cc",
"util/string_util.cc", "util/string_util.cc",
"util/sync_point.cc",
"util/sync_point_impl.cc",
"util/thread_local.cc", "util/thread_local.cc",
"util/threadpool_imp.cc", "util/threadpool_imp.cc",
"util/trace_replay.cc", "util/trace_replay.cc",
"util/transaction_test_util.cc",
"util/xxhash.cc", "util/xxhash.cc",
"utilities/backupable/backupable_db.cc", "utilities/backupable/backupable_db.cc",
"utilities/blob_db/blob_compaction_filter.cc", "utilities/blob_db/blob_compaction_filter.cc",
@ -309,10 +309,10 @@ cpp_library(
srcs = [ srcs = [
"db/db_test_util.cc", "db/db_test_util.cc",
"table/mock_table.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", "tools/trace_analyzer_tool.cc",
"util/fault_injection_test_env.cc",
"util/testharness.cc",
"util/testutil.cc",
"utilities/cassandra/test_utils.cc", "utilities/cassandra/test_utils.cc",
], ],
auto_headers = AutoHeaders.RECURSIVE_GLOB, auto_headers = AutoHeaders.RECURSIVE_GLOB,
@ -326,9 +326,9 @@ cpp_library(
cpp_library( cpp_library(
name = "rocksdb_tools_lib", name = "rocksdb_tools_lib",
srcs = [ srcs = [
"test_util/testutil.cc",
"tools/db_bench_tool.cc", "tools/db_bench_tool.cc",
"tools/trace_analyzer_tool.cc", "tools/trace_analyzer_tool.cc",
"util/testutil.cc",
], ],
auto_headers = AutoHeaders.RECURSIVE_GLOB, auto_headers = AutoHeaders.RECURSIVE_GLOB,
arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS, arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,

View File

@ -118,7 +118,7 @@ def generate_targets(repo_path):
"rocksdb_tools_lib", "rocksdb_tools_lib",
src_mk.get("BENCH_LIB_SOURCES", []) + src_mk.get("BENCH_LIB_SOURCES", []) +
src_mk.get("ANALYZER_LIB_SOURCES", []) + src_mk.get("ANALYZER_LIB_SOURCES", []) +
["util/testutil.cc"], ["test_util/testutil.cc"],
[":rocksdb_lib"]) [":rocksdb_lib"])
# test for every test we found in the Makefile # test for every test we found in the Makefile

2
cache/cache_test.cc vendored
View File

@ -18,7 +18,7 @@
#include "cache/lru_cache.h" #include "cache/lru_cache.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -8,7 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "port/port.h" #include "port/port.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -34,7 +34,7 @@
#include "table/internal_iterator.h" #include "table/internal_iterator.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -21,11 +21,11 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/iterator.h" #include "rocksdb/iterator.h"
#include "util/coding.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/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -15,8 +15,8 @@
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -19,7 +19,7 @@
#include "db/column_family.h" #include "db/column_family.h"
#include "rocksdb/compaction_filter.h" #include "rocksdb/compaction_filter.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -9,7 +9,7 @@
#include "port/likely.h" #include "port/likely.h"
#include "rocksdb/listener.h" #include "rocksdb/listener.h"
#include "table/internal_iterator.h" #include "table/internal_iterator.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#define DEFINITELY_IN_SNAPSHOT(seq, snapshot) \ #define DEFINITELY_IN_SNAPSHOT(seq, snapshot) \
((seq) <= (snapshot) && \ ((seq) <= (snapshot) && \

View File

@ -10,8 +10,8 @@
#include "port/port.h" #include "port/port.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -61,7 +61,7 @@
#include "util/random.h" #include "util/random.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -58,9 +58,9 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/rate_limiter.h" #include "util/rate_limiter.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
#if !defined(IOS_CROSS_COMPILE) #if !defined(IOS_CROSS_COMPILE)

View File

@ -27,8 +27,8 @@
#include "table/mock_table.h" #include "table/mock_table.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -25,7 +25,7 @@
#include "util/log_buffer.h" #include "util/log_buffer.h"
#include "util/random.h" #include "util/random.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -14,8 +14,8 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -25,7 +25,7 @@
#include "util/log_buffer.h" #include "util/log_buffer.h"
#include "util/random.h" #include "util/random.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {
namespace { namespace {

View File

@ -12,8 +12,8 @@
#include "util/hash.h" #include "util/hash.h"
#include "util/kv_map.h" #include "util/kv_map.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
using std::unique_ptr; using std::unique_ptr;

View File

@ -28,8 +28,8 @@
#include "table/block_based_table_builder.h" #include "table/block_based_table_builder.h"
#include "table/meta_blocks.h" #include "table/meta_blocks.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -12,8 +12,8 @@
#include "table/cuckoo_table_reader.h" #include "table/cuckoo_table_reader.h"
#include "table/meta_blocks.h" #include "table/meta_blocks.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -10,9 +10,9 @@
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/perf_context.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) #if !defined(ROCKSDB_LITE)
#include "util/sync_point.h" #include "test_util/sync_point.h"
#endif #endif
namespace rocksdb { namespace rocksdb {

View File

@ -14,8 +14,8 @@
#include "rocksdb/experimental.h" #include "rocksdb/experimental.h"
#include "rocksdb/utilities/convenience.h" #include "rocksdb/utilities/convenience.h"
#include "util/concurrent_task_limiter_impl.h" #include "util/concurrent_task_limiter_impl.h"
#include "util/fault_injection_test_env.h" #include "test_util/fault_injection_test_env.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -7,7 +7,7 @@
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/perf_context.h" #include "rocksdb/perf_context.h"
#if !defined(ROCKSDB_LITE) #if !defined(ROCKSDB_LITE)
#include "util/sync_point.h" #include "test_util/sync_point.h"
#endif #endif
#include <iostream> #include <iostream>
#include <string> #include <string>

View File

@ -23,7 +23,7 @@
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -9,8 +9,8 @@
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "util/fault_injection_test_env.h" #include "test_util/fault_injection_test_env.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -97,7 +97,7 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {
const std::string kDefaultColumnFamilyName("default"); const std::string kDefaultColumnFamilyName("default");

View File

@ -22,7 +22,7 @@
#include "monitoring/thread_status_updater.h" #include "monitoring/thread_status_updater.h"
#include "monitoring/thread_status_util.h" #include "monitoring/thread_status_util.h"
#include "util/concurrent_task_limiter_impl.h" #include "util/concurrent_task_limiter_impl.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -20,7 +20,7 @@
#include "rocksdb/wal_filter.h" #include "rocksdb/wal_filter.h"
#include "table/block_based_table_factory.h" #include "table/block_based_table_factory.h"
#include "util/rate_limiter.h" #include "util/rate_limiter.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {
Options SanitizeOptions(const std::string& dbname, const Options& src) { Options SanitizeOptions(const std::string& dbname, const Options& src) {

View File

@ -16,7 +16,7 @@
#include "db/event_helpers.h" #include "db/event_helpers.h"
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"
#include "options/options_helper.h" #include "options/options_helper.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {
// Convenience methods // Convenience methods

View File

@ -10,7 +10,7 @@
#include "rocksdb/slice.h" #include "rocksdb/slice.h"
#include "util/random.h" #include "util/random.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
#ifdef GFLAGS #ifdef GFLAGS

View File

@ -18,8 +18,8 @@
#include "table/iterator_wrapper.h" #include "table/iterator_wrapper.h"
#include "table/merging_iterator.h" #include "table/merging_iterator.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -20,8 +20,8 @@
#include "rocksdb/rate_limiter.h" #include "rocksdb/rate_limiter.h"
#include "rocksdb/stats_history.h" #include "rocksdb/stats_history.h"
#include "util/random.h" #include "util/random.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -5,7 +5,7 @@
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -10,8 +10,8 @@
#include "db/db_impl_secondary.h" #include "db/db_impl_secondary.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "util/fault_injection_test_env.h" #include "test_util/fault_injection_test_env.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -14,8 +14,8 @@
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/utilities/table_properties_collectors.h" #include "rocksdb/utilities/table_properties_collectors.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE

View File

@ -63,9 +63,9 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/rate_limiter.h" #include "util/rate_limiter.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -46,13 +46,13 @@
#include "table/plain_table_factory.h" #include "table/plain_table_factory.h"
#include "table/scoped_arena_iterator.h" #include "table/scoped_arena_iterator.h"
#include "util/compression.h" #include "util/compression.h"
#include "util/mock_time_env.h" #include "test_util/mock_time_env.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -11,7 +11,7 @@
#include "port/stack_trace.h" #include "port/stack_trace.h"
#if !defined(ROCKSDB_LITE) #if !defined(ROCKSDB_LITE)
#include "rocksdb/utilities/table_properties_collectors.h" #include "rocksdb/utilities/table_properties_collectors.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -11,8 +11,8 @@
#include "options/options_helper.h" #include "options/options_helper.h"
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "util/fault_injection_test_env.h" #include "test_util/fault_injection_test_env.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {
class DBWALTest : public DBTestBase { class DBWALTest : public DBTestBase {

View File

@ -12,9 +12,9 @@
#include "db/write_thread.h" #include "db/write_thread.h"
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.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/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

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

View File

@ -21,9 +21,9 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/transaction_log.h" #include "rocksdb/transaction_log.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -12,9 +12,9 @@
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/perf_context.h" #include "rocksdb/perf_context.h"
#include "rocksdb/sst_file_manager.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) #if !defined(ROCKSDB_LITE)
#include "util/sync_point.h" #include "test_util/sync_point.h"
#endif #endif
namespace rocksdb { namespace rocksdb {

View File

@ -9,7 +9,7 @@
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/sst_file_writer.h" #include "rocksdb/sst_file_writer.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -24,7 +24,7 @@
#include "table/table_builder.h" #include "table/table_builder.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -11,8 +11,8 @@
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/sst_file_writer.h" #include "rocksdb/sst_file_writer.h"
#include "util/fault_injection_test_env.h" #include "test_util/fault_injection_test_env.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -21,12 +21,12 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"
#include "rocksdb/write_batch.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/logging.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -13,8 +13,8 @@
#include "db/version_edit.h" #include "db/version_edit.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -12,7 +12,7 @@
#include "db/dbformat.h" #include "db/dbformat.h"
#include "port/port.h" #include "port/port.h"
#include "util/logging.h" #include "util/logging.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -51,7 +51,7 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -15,8 +15,8 @@
#include "table/mock_table.h" #include "table/mock_table.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -22,7 +22,7 @@
#include "rocksdb/slice_transform.h" #include "rocksdb/slice_transform.h"
#include "table/merging_iterator.h" #include "table/merging_iterator.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -35,7 +35,7 @@ int main() { return 0; }
#include "rocksdb/status.h" #include "rocksdb/status.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"
#include "util/gflags_compat.h" #include "util/gflags_compat.h"
#include "util/testharness.h" #include "test_util/testharness.h"
const int MAX_SHARDS = 100000; const int MAX_SHARDS = 100000;

View File

@ -29,9 +29,9 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/rate_limiter.h" #include "util/rate_limiter.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE

View File

@ -14,8 +14,8 @@
#include "util/crc32c.h" #include "util/crc32c.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/random.h" #include "util/random.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {
namespace log { namespace log {

View File

@ -12,7 +12,7 @@
#include "rocksdb/compaction_filter.h" #include "rocksdb/compaction_filter.h"
#include "rocksdb/slice.h" #include "rocksdb/slice.h"
#include "rocksdb/write_batch.h" #include "rocksdb/write_batch.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "port/port.h" #include "port/port.h"
using namespace rocksdb; using namespace rocksdb;

View File

@ -24,7 +24,7 @@
#include "table/merging_iterator.h" #include "table/merging_iterator.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/log_buffer.h" #include "util/log_buffer.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -14,8 +14,8 @@
#include "rocksdb/status.h" #include "rocksdb/status.h"
#include "rocksdb/write_buffer_manager.h" #include "rocksdb/write_buffer_manager.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -10,8 +10,8 @@
#include "db/merge_helper.h" #include "db/merge_helper.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

View File

@ -18,7 +18,7 @@
#include "db/db_impl.h" #include "db/db_impl.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -21,9 +21,9 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/transaction_log.h" #include "rocksdb/transaction_log.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
using std::cerr; using std::cerr;
using std::cout; using std::cout;

View File

@ -10,7 +10,7 @@
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {
class OptionsFileTest : public testing::Test { class OptionsFileTest : public testing::Test {

View File

@ -19,7 +19,7 @@
#include "rocksdb/slice_transform.h" #include "rocksdb/slice_transform.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
bool FLAGS_random_key = false; bool FLAGS_random_key = false;

View File

@ -33,8 +33,8 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
using std::unique_ptr; using std::unique_ptr;

View File

@ -31,7 +31,7 @@ int main() {
#include "util/random.h" #include "util/random.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
using GFLAGS_NAMESPACE::ParseCommandLineFlags; using GFLAGS_NAMESPACE::ParseCommandLineFlags;

View File

@ -26,7 +26,7 @@ int main() {
#include "util/coding.h" #include "util/coding.h"
#include "util/random.h" #include "util/random.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#include "util/gflags_compat.h" #include "util/gflags_compat.h"

View File

@ -12,7 +12,7 @@
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/range_tombstone_fragmenter.h" #include "db/range_tombstone_fragmenter.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -7,7 +7,7 @@
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -25,7 +25,7 @@
#include "util/coding.h" #include "util/coding.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -20,8 +20,8 @@
#include "table/table_builder.h" #include "table/table_builder.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -8,8 +8,8 @@
#include "db/version_set.h" #include "db/version_set.h"
#include "util/logging.h" #include "util/logging.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -14,7 +14,7 @@
#include "util/coding.h" #include "util/coding.h"
#include "util/event_logger.h" #include "util/event_logger.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -9,8 +9,8 @@
#include "db/version_edit.h" #include "db/version_edit.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -52,7 +52,7 @@
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/user_comparator_wrapper.h" #include "util/user_comparator_wrapper.h"
namespace rocksdb { namespace rocksdb {

View File

@ -12,8 +12,8 @@
#include "table/mock_table.h" #include "table/mock_table.h"
#include "util/logging.h" #include "util/logging.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -34,7 +34,7 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -21,8 +21,8 @@
#include "table/mock_table.h" #include "table/mock_table.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
namespace rocksdb { namespace rocksdb {

View File

@ -19,7 +19,7 @@
#include "rocksdb/write_buffer_manager.h" #include "rocksdb/write_buffer_manager.h"
#include "table/scoped_arena_iterator.h" #include "table/scoped_arena_iterator.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -17,8 +17,8 @@
#include "rocksdb/write_batch.h" #include "rocksdb/write_batch.h"
#include "port/port.h" #include "port/port.h"
#include "util/random.h" #include "util/random.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
using std::string; using std::string;

View File

@ -8,7 +8,7 @@
#include "db/write_controller.h" #include "db/write_controller.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -10,7 +10,7 @@
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"
#include "port/port.h" #include "port/port.h"
#include "util/random.h" #include "util/random.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -12,7 +12,7 @@
#include "env/mock_env.h" #include "env/mock_env.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/utilities/object_registry.h" #include "rocksdb/utilities/object_registry.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

2
env/env_posix.cc vendored
View File

@ -54,7 +54,7 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/random.h" #include "util/random.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/thread_local.h" #include "util/thread_local.h"
#include "util/threadpool_imp.h" #include "util/threadpool_imp.h"

6
env/env_test.cc vendored
View File

@ -44,9 +44,9 @@
#include "util/log_buffer.h" #include "util/log_buffer.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#ifdef OS_LINUX #ifdef OS_LINUX
static const size_t kPageSize = sysconf(_SC_PAGESIZE); static const size_t kPageSize = sysconf(_SC_PAGESIZE);

2
env/io_posix.cc vendored
View File

@ -33,7 +33,7 @@
#include "rocksdb/slice.h" #include "rocksdb/slice.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/string_util.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) #if defined(OS_LINUX) && !defined(F_SET_RW_HINT)
#define F_LINUX_SPECIFIC_BASE 1024 #define F_LINUX_SPECIFIC_BASE 1024

View File

@ -10,7 +10,7 @@
#include <string> #include <string>
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

2
env/posix_logger.h vendored
View File

@ -27,7 +27,7 @@
#include "env/io_posix.h" #include "env/io_posix.h"
#include "monitoring/iostats_context_imp.h" #include "monitoring/iostats_context_imp.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -15,7 +15,7 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "util/logging.h" #include "util/logging.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -17,9 +17,9 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
#include "util/testharness.h" #include "test_util/testharness.h"
#include "util/testutil.h" #include "test_util/testutil.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE

View File

@ -21,7 +21,7 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -17,7 +17,7 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/sst_file_manager.h" #include "rocksdb/sst_file_manager.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {

View File

@ -23,7 +23,7 @@
#include "rocksjni/portal.h" #include "rocksjni/portal.h"
#include "table/scoped_arena_iterator.h" #include "table/scoped_arena_iterator.h"
#include "util/string_util.h" #include "util/string_util.h"
#include "util/testharness.h" #include "test_util/testharness.h"
/* /*
* Class: org_rocksdb_WriteBatchTest * Class: org_rocksdb_WriteBatchTest

View File

@ -14,7 +14,7 @@
#include "util/concurrent_arena.h" #include "util/concurrent_arena.h"
#include "util/hash.h" #include "util/hash.h"
#include "util/random.h" #include "util/random.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -39,7 +39,7 @@ int main() {
#include "util/gflags_compat.h" #include "util/gflags_compat.h"
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/stop_watch.h" #include "util/stop_watch.h"
#include "util/testutil.h" #include "test_util/testutil.h"
using GFLAGS_NAMESPACE::ParseCommandLineFlags; using GFLAGS_NAMESPACE::ParseCommandLineFlags;
using GFLAGS_NAMESPACE::RegisterFlagValidator; using GFLAGS_NAMESPACE::RegisterFlagValidator;

View File

@ -13,7 +13,7 @@
#include "util/arena.h" #include "util/arena.h"
#include "util/hash.h" #include "util/hash.h"
#include "util/random.h" #include "util/random.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

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

View File

@ -7,7 +7,7 @@
#include "monitoring/histogram.h" #include "monitoring/histogram.h"
#include "monitoring/histogram_windowing.h" #include "monitoring/histogram_windowing.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

View File

@ -6,7 +6,7 @@
#include "monitoring/instrumented_mutex.h" #include "monitoring/instrumented_mutex.h"
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"
#include "monitoring/thread_status_util.h" #include "monitoring/thread_status_util.h"
#include "util/sync_point.h" #include "test_util/sync_point.h"
namespace rocksdb { namespace rocksdb {
namespace { namespace {

View File

@ -4,7 +4,7 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "rocksdb/iostats_context.h" #include "rocksdb/iostats_context.h"
#include "util/testharness.h" #include "test_util/testharness.h"
namespace rocksdb { namespace rocksdb {

Some files were not shown because too many files have changed in this diff Show More