andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move some memory related files from util/ to memory/ (#5382)

Browse Source 
Summary:
Move arena, allocator, and memory tools under util to a separate memory/ directory.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5382

Differential Revision: D15564655

Pulled By: siying

fbshipit-source-id: 9cd6b5d0d3d52b39606e19221fa154596e5852a5
This commit is contained in:
Siying Dong 2019-05-30 17:39:43 -07:00 committed by Facebook Github Bot
parent f1302ebab8
commit 8843129ece
196 changed files with 398 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -542,6 +542,9 @@ set(SOURCES
file/file_util.cc
file/filename.cc
file/sst_file_manager_impl.cc
memory/arena.cc
memory/concurrent_arena.cc
memory/jemalloc_nodump_allocator.cc
memtable/alloc_tracker.cc
memtable/hash_linklist_rep.cc
memtable/hash_skiplist_rep.cc
@ -610,14 +613,12 @@ set(SOURCES
tools/ldb_tool.cc
tools/sst_dump_tool.cc
tools/trace_analyzer_tool.cc
util/arena.cc
util/auto_roll_logger.cc
util/bloom.cc
util/coding.cc
util/compaction_job_stats_impl.cc
util/comparator.cc
util/compression_context_cache.cc
util/concurrent_arena.cc
util/concurrent_task_limiter_impl.cc
util/crc32c.cc
util/dynamic_bloom.cc
@ -625,7 +626,6 @@ set(SOURCES
util/file_reader_writer.cc
util/filter_policy.cc
util/hash.cc
util/jemalloc_nodump_allocator.cc
util/log_buffer.cc
util/murmurhash.cc
util/random.cc
@ -932,6 +932,7 @@ if(WITH_TESTS)
env/env_test.cc
env/mock_env_test.cc
file/delete_scheduler_test.cc
memory/arena_test.cc
memtable/inlineskiplist_test.cc
memtable/skiplist_test.cc
memtable/write_buffer_manager_test.cc
@ -955,7 +956,6 @@ if(WITH_TESTS)
tools/reduce_levels_test.cc
tools/sst_dump_test.cc
tools/trace_analyzer_test.cc
util/arena_test.cc
util/auto_roll_logger_test.cc
util/autovector_test.cc
util/bloom_test.cc

2
Makefile
View File

@ -1127,7 +1127,7 @@ db_sanity_test: tools/db_sanity_test.o $(LIBOBJECTS) $(TESTUTIL)
db_repl_stress: tools/db_repl_stress.o $(LIBOBJECTS) $(TESTUTIL)
$(AM_LINK)
arena_test: util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS)
arena_test: memory/arena_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK)
autovector_test: util/autovector_test.o $(LIBOBJECTS) $(TESTHARNESS)

10
TARGETS
View File

@ -147,6 +147,9 @@ cpp_library(
"file/file_util.cc",
"file/filename.cc",
"file/sst_file_manager_impl.cc",
"memory/arena.cc",
"memory/concurrent_arena.cc",
"memory/jemalloc_nodump_allocator.cc",
"memtable/alloc_tracker.cc",
"memtable/hash_linklist_rep.cc",
"memtable/hash_skiplist_rep.cc",
@ -181,8 +184,8 @@ cpp_library(
"table/block_based/block_based_table_reader.cc",
"table/block_based/block_builder.cc",
"table/block_based/block_prefix_index.cc",
"table/block_based/data_block_hash_index.cc",
"table/block_based/data_block_footer.cc",
"table/block_based/data_block_hash_index.cc",
"table/block_based/flush_block_policy.cc",
"table/block_based/full_filter_block.cc",
"table/block_based/index_builder.cc",
@ -214,7 +217,6 @@ cpp_library(
"tools/ldb_cmd.cc",
"tools/ldb_tool.cc",
"tools/sst_dump_tool.cc",
"util/arena.cc",
"util/auto_roll_logger.cc",
"util/bloom.cc",
"util/build_version.cc",
@ -222,7 +224,6 @@ cpp_library(
"util/compaction_job_stats_impl.cc",
"util/comparator.cc",
"util/compression_context_cache.cc",
"util/concurrent_arena.cc",
"util/concurrent_task_limiter_impl.cc",
"util/crc32c.cc",
"util/dynamic_bloom.cc",
@ -230,7 +231,6 @@ cpp_library(
"util/file_reader_writer.cc",
"util/filter_policy.cc",
"util/hash.cc",
"util/jemalloc_nodump_allocator.cc",
"util/log_buffer.cc",
"util/murmurhash.cc",
"util/random.cc",
@ -353,7 +353,7 @@ cpp_library(
ROCKS_TESTS = [
[
"arena_test",
"util/arena_test.cc",
"memory/arena_test.cc",
"serial",
],
[

2
cache/cache_test.cc vendored
View File

@ -16,9 +16,9 @@
#include <vector>
#include "cache/clock_cache.h"
#include "cache/lru_cache.h"
#include "test_util/testharness.h"
#include "util/coding.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
namespace rocksdb {

2
db/builder.cc
View File

@ -32,9 +32,9 @@
#include "table/block_based/block_based_table_builder.h"
#include "table/format.h"
#include "table/internal_iterator.h"
#include "test_util/sync_point.h"
#include "util/file_reader_writer.h"
#include "util/stop_watch.h"
#include "test_util/sync_point.h"
namespace rocksdb {

4
db/column_family_test.cc
View File

@ -20,12 +20,12 @@
#include "rocksdb/db.h"
#include "rocksdb/env.h"
#include "rocksdb/iterator.h"
#include "util/coding.h"
#include "test_util/fault_injection_test_env.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/coding.h"
#include "util/string_util.h"
#include "utilities/merge_operators.h"
namespace rocksdb {

2
db/compact_files_test.cc
View File

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

2
db/compaction.cc
View File

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

2
db/compaction.h
View File

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

2
db/compaction_iterator_test.cc
View File

@ -9,9 +9,9 @@
#include <vector>
#include "port/port.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/string_util.h"
#include "utilities/merge_operators.h"
namespace rocksdb {

2
db/compaction_job.cc
View File

@ -53,6 +53,7 @@
#include "table/block_based/block_based_table_factory.h"
#include "table/merging_iterator.h"
#include "table/table_builder.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/file_reader_writer.h"
#include "util/log_buffer.h"
@ -61,7 +62,6 @@
#include "util/random.h"
#include "util/stop_watch.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
namespace rocksdb {

6
db/compaction_job_stats_test.cc
View File

@ -52,15 +52,15 @@
#include "table/mock_table.h"
#include "table/plain/plain_table_factory.h"
#include "table/scoped_arena_iterator.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/compression.h"
#include "util/hash.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "util/rate_limiter.h"
#include "util/string_util.h"
#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)

4
db/compaction_job_test.cc
View File

@ -25,10 +25,10 @@
#include "rocksdb/options.h"
#include "rocksdb/write_buffer_manager.h"
#include "table/mock_table.h"
#include "util/file_reader_writer.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/file_reader_writer.h"
#include "util/string_util.h"
#include "utilities/merge_operators.h"
namespace rocksdb {

2
db/compaction_picker.cc
View File

@ -22,10 +22,10 @@
#include "db/column_family.h"
#include "file/filename.h"
#include "monitoring/statistics.h"
#include "test_util/sync_point.h"
#include "util/log_buffer.h"
#include "util/random.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
namespace rocksdb {

4
db/compaction_picker_test.cc
View File

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

2
db/compaction_picker_universal.cc
View File

@ -22,10 +22,10 @@
#include "db/column_family.h"
#include "file/filename.h"
#include "monitoring/statistics.h"
#include "test_util/sync_point.h"
#include "util/log_buffer.h"
#include "util/random.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
namespace rocksdb {
namespace {

4
db/comparator_db_test.cc
View File

@ -9,11 +9,11 @@
#include "memtable/stl_wrappers.h"
#include "rocksdb/db.h"
#include "rocksdb/env.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/hash.h"
#include "util/kv_map.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "utilities/merge_operators.h"
using std::unique_ptr;

3
db/corruption_test.cc
View File

@ -27,10 +27,9 @@
#include "rocksdb/write_batch.h"
#include "table/block_based/block_based_table_builder.h"
#include "table/meta_blocks.h"
#include "file/filename.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/string_util.h"
namespace rocksdb {

2
db/cuckoo_table_db_test.cc
View File

@ -11,9 +11,9 @@
#include "table/cuckoo/cuckoo_table_factory.h"
#include "table/cuckoo/cuckoo_table_reader.h"
#include "table/meta_blocks.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/string_util.h"
namespace rocksdb {

2
db/db_compaction_test.cc
View File

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

2
db/db_filesnapshot.cc
View File

@ -22,8 +22,8 @@
#include "port/port.h"
#include "rocksdb/db.h"
#include "rocksdb/env.h"
#include "util/mutexlock.h"
#include "test_util/sync_point.h"
#include "util/mutexlock.h"
namespace rocksdb {

2
db/db_impl.cc
View File

@ -84,6 +84,7 @@
#include "table/multiget_context.h"
#include "table/table_builder.h"
#include "table/two_level_iterator.h"
#include "test_util/sync_point.h"
#include "tools/sst_dump_tool_imp.h"
#include "util/auto_roll_logger.h"
#include "util/autovector.h"
@ -97,7 +98,6 @@
#include "util/mutexlock.h"
#include "util/stop_watch.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
namespace rocksdb {
const std::string kDefaultColumnFamilyName("default");

2
db/db_impl_compaction_flush.cc
View File

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

2
db/db_impl_open.cc
View File

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

2
db/db_iter.cc
View File

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

2
db/db_iter.h
View File

@ -13,10 +13,10 @@
#include "db/db_impl.h"
#include "db/dbformat.h"
#include "db/range_del_aggregator.h"
#include "memory/arena.h"
#include "options/cf_options.h"
#include "rocksdb/db.h"
#include "rocksdb/iterator.h"
#include "util/arena.h"
#include "util/autovector.h"
namespace rocksdb {

2
db/db_iter_stress_test.cc
View File

@ -8,9 +8,9 @@
#include "rocksdb/comparator.h"
#include "rocksdb/options.h"
#include "rocksdb/slice.h"
#include "test_util/testharness.h"
#include "util/random.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "utilities/merge_operators.h"
#ifdef GFLAGS

2
db/db_iter_test.cc
View File

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

2
db/db_options_test.cc
View File

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

6
db/db_test.cc
View File

@ -58,14 +58,14 @@
#include "table/mock_table.h"
#include "table/plain/plain_table_factory.h"
#include "table/scoped_arena_iterator.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/compression.h"
#include "util/file_reader_writer.h"
#include "util/mutexlock.h"
#include "util/rate_limiter.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "utilities/merge_operators.h"
namespace rocksdb {

4
db/db_test_util.h
View File

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

2
db/db_write_test.cc
View File

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

2
db/dbformat_test.cc
View File

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

2
db/deletefile_test.cc
View File

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

2
db/external_sst_file_ingestion_job.cc
View File

@ -22,9 +22,9 @@
#include "table/scoped_arena_iterator.h"
#include "table/sst_file_writer_collectors.h"
#include "table/table_builder.h"
#include "test_util/sync_point.h"
#include "util/file_reader_writer.h"
#include "util/stop_watch.h"
#include "test_util/sync_point.h"
namespace rocksdb {

4
db/fault_injection_test.cc
View File

@ -22,11 +22,11 @@
#include "rocksdb/table.h"
#include "rocksdb/write_batch.h"
#include "test_util/fault_injection_test_env.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/logging.h"
#include "util/mutexlock.h"
namespace rocksdb {

2
db/file_indexer.h
View File

@ -12,8 +12,8 @@
#include <functional>
#include <limits>
#include <vector>
#include "memory/arena.h"
#include "port/port.h"
#include "util/arena.h"
#include "util/autovector.h"
namespace rocksdb {

2
db/file_indexer_test.cc
View File

@ -7,8 +7,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors.
#include <string>
#include "db/file_indexer.h"
#include <string>
#include "db/dbformat.h"
#include "db/version_edit.h"
#include "port/stack_trace.h"

2
db/filename_test.cc
View File

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

2
db/flush_job.cc
View File

@ -45,13 +45,13 @@
#include "table/merging_iterator.h"
#include "table/table_builder.h"
#include "table/two_level_iterator.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/event_logger.h"
#include "util/log_buffer.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "util/stop_watch.h"
#include "test_util/sync_point.h"
namespace rocksdb {

4
db/flush_job_test.cc
View File

@ -13,10 +13,10 @@
#include "rocksdb/cache.h"
#include "rocksdb/write_buffer_manager.h"
#include "table/mock_table.h"
#include "util/file_reader_writer.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/file_reader_writer.h"
#include "util/string_util.h"
namespace rocksdb {

2
db/forward_iterator.cc
View File

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

4
db/forward_iterator.h
View File

@ -10,12 +10,12 @@
#include <vector>
#include <queue>
#include "db/dbformat.h"
#include "memory/arena.h"
#include "rocksdb/db.h"
#include "rocksdb/iterator.h"
#include "rocksdb/options.h"
#include "db/dbformat.h"
#include "table/internal_iterator.h"
#include "util/arena.h"
namespace rocksdb {

2
db/forward_iterator_bench.cc
View File

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

7
db/listener_test.cc
View File

@ -24,15 +24,14 @@
#include "rocksdb/table_properties.h"
#include "table/block_based/block_based_table_factory.h"
#include "table/plain/plain_table_factory.h"
#include "file/filename.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/hash.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "util/rate_limiter.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "utilities/merge_operators.h"
#ifndef ROCKSDB_LITE

4
db/log_test.cc
View File

@ -10,12 +10,12 @@
#include "db/log_reader.h"
#include "db/log_writer.h"
#include "rocksdb/env.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/coding.h"
#include "util/crc32c.h"
#include "util/file_reader_writer.h"
#include "util/random.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
namespace rocksdb {
namespace log {

4
db/manual_compaction_test.cc
View File

@ -8,12 +8,12 @@
#include <sstream>
#include <cstdlib>
#include "rocksdb/db.h"
#include "port/port.h"
#include "rocksdb/compaction_filter.h"
#include "rocksdb/db.h"
#include "rocksdb/slice.h"
#include "rocksdb/write_batch.h"
#include "test_util/testharness.h"
#include "port/port.h"
using namespace rocksdb;

4
db/memtable.cc
View File

@ -19,6 +19,8 @@
#include "db/pinned_iterators_manager.h"
#include "db/range_tombstone_fragmenter.h"
#include "db/read_callback.h"
#include "memory/arena.h"
#include "memory/memory_usage.h"
#include "monitoring/perf_context_imp.h"
#include "monitoring/statistics.h"
#include "port/port.h"
@ -31,10 +33,8 @@
#include "table/internal_iterator.h"
#include "table/iterator_wrapper.h"
#include "table/merging_iterator.h"
#include "util/arena.h"
#include "util/autovector.h"
#include "util/coding.h"
#include "util/memory_usage.h"
#include "util/mutexlock.h"
#include "util/util.h"

4
db/memtable.h
View File

@ -19,13 +19,13 @@
#include "db/range_tombstone_fragmenter.h"
#include "db/read_callback.h"
#include "db/version_edit.h"
#include "memory/allocator.h"
#include "memory/concurrent_arena.h"
#include "monitoring/instrumented_mutex.h"
#include "options/cf_options.h"
#include "rocksdb/db.h"
#include "rocksdb/env.h"
#include "rocksdb/memtablerep.h"
#include "util/allocator.h"
#include "util/concurrent_arena.h"
#include "util/dynamic_bloom.h"
#include "util/hash.h"

2
db/memtable_list.cc
View File

@ -22,9 +22,9 @@
#include "rocksdb/env.h"
#include "rocksdb/iterator.h"
#include "table/merging_iterator.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/log_buffer.h"
#include "test_util/sync_point.h"
namespace rocksdb {

2
db/memtable_list_test.cc
View File

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

2
db/merge_helper_test.cc
View File

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

8
db/merge_test.cc
View File

@ -7,6 +7,9 @@
#include <memory>
#include <iostream>
#include "db/db_impl.h"
#include "db/dbformat.h"
#include "db/write_batch_internal.h"
#include "port/stack_trace.h"
#include "rocksdb/cache.h"
#include "rocksdb/comparator.h"
@ -14,11 +17,8 @@
#include "rocksdb/env.h"
#include "rocksdb/merge_operator.h"
#include "rocksdb/utilities/db_ttl.h"
#include "db/dbformat.h"
#include "db/db_impl.h"
#include "db/write_batch_internal.h"
#include "utilities/merge_operators.h"
#include "test_util/testharness.h"
#include "utilities/merge_operators.h"
namespace rocksdb {

2
db/obsolete_files_test.cc
View File

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

2
db/perf_context_test.cc
View File

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

4
db/plain_table_db_test.cc
View File

@ -29,12 +29,12 @@
#include "table/plain/plain_table_key_coding.h"
#include "table/plain/plain_table_reader.h"
#include "table/table_builder.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/hash.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "utilities/merge_operators.h"
using std::unique_ptr;

2
db/prefix_test.cc
View File

@ -26,12 +26,12 @@ int main() {
#include "rocksdb/perf_context.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/table.h"
#include "test_util/testharness.h"
#include "util/coding.h"
#include "util/gflags_compat.h"
#include "util/random.h"
#include "util/stop_watch.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "utilities/merge_operators.h"
using GFLAGS_NAMESPACE::ParseCommandLineFlags;

2
db/range_del_aggregator_bench.cc
View File

@ -23,10 +23,10 @@ int main() {
#include "db/range_tombstone_fragmenter.h"
#include "rocksdb/comparator.h"
#include "rocksdb/env.h"
#include "test_util/testutil.h"
#include "util/coding.h"
#include "util/random.h"
#include "util/stop_watch.h"
#include "test_util/testutil.h"
#include "util/gflags_compat.h"

2
db/table_cache.cc
View File

@ -22,10 +22,10 @@
#include "table/multiget_context.h"
#include "table/table_builder.h"
#include "table/table_reader.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/file_reader_writer.h"
#include "util/stop_watch.h"
#include "test_util/sync_point.h"
namespace rocksdb {

6
db/table_properties_collector_test.cc
View File

@ -13,16 +13,16 @@
#include "db/dbformat.h"
#include "db/table_properties_collector.h"
#include "table/meta_blocks.h"
#include "options/cf_options.h"
#include "rocksdb/table.h"
#include "table/block_based/block_based_table_factory.h"
#include "table/meta_blocks.h"
#include "table/plain/plain_table_factory.h"
#include "table/table_builder.h"
#include "util/coding.h"
#include "util/file_reader_writer.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/coding.h"
#include "util/file_reader_writer.h"
namespace rocksdb {

4
db/version_builder_test.cc
View File

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

2
db/version_edit.cc
View File

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

6
db/version_edit.h
View File

@ -10,12 +10,12 @@
#pragma once
#include <algorithm>
#include <set>
#include <string>
#include <utility>
#include <vector>
#include <string>
#include "rocksdb/cache.h"
#include "db/dbformat.h"
#include "util/arena.h"
#include "memory/arena.h"
#include "rocksdb/cache.h"
#include "util/autovector.h"
namespace rocksdb {

2
db/version_edit_test.cc
View File

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

2
db/version_set.cc
View File

@ -48,11 +48,11 @@
#include "table/plain/plain_table_factory.h"
#include "table/table_reader.h"
#include "table/two_level_iterator.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/file_reader_writer.h"
#include "util/stop_watch.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#include "util/user_comparator_wrapper.h"
namespace rocksdb {

4
db/version_set_test.cc
View File

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

2
db/wal_manager.cc
View File

@ -28,13 +28,13 @@
#include "rocksdb/env.h"
#include "rocksdb/options.h"
#include "rocksdb/write_batch.h"
#include "test_util/sync_point.h"
#include "util/cast_util.h"
#include "util/coding.h"
#include "util/file_reader_writer.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
namespace rocksdb {

4
db/wal_manager_test.cc
View File

@ -19,10 +19,10 @@
#include "db/wal_manager.h"
#include "env/mock_env.h"
#include "table/mock_table.h"
#include "util/file_reader_writer.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/file_reader_writer.h"
#include "util/string_util.h"
namespace rocksdb {

2
db/write_batch_test.cc
View File

@ -18,8 +18,8 @@
#include "rocksdb/utilities/write_batch_with_index.h"
#include "rocksdb/write_buffer_manager.h"
#include "table/scoped_arena_iterator.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "util/string_util.h"
namespace rocksdb {

4
db/write_callback_test.cc
View File

@ -13,12 +13,12 @@
#include "db/db_impl.h"
#include "db/write_callback.h"
#include "port/port.h"
#include "rocksdb/db.h"
#include "rocksdb/write_batch.h"
#include "port/port.h"
#include "util/random.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "util/random.h"
using std::string;

2
db/write_thread.cc
View File

@ -9,8 +9,8 @@
#include "db/column_family.h"
#include "monitoring/perf_context_imp.h"
#include "port/port.h"
#include "util/random.h"
#include "test_util/sync_point.h"
#include "util/random.h"
namespace rocksdb {

2
env/env.cc vendored
View File

@ -10,11 +10,11 @@
#include "rocksdb/env.h"
#include <thread>
#include "memory/arena.h"
#include "options/db_options.h"
#include "port/port.h"
#include "port/sys_time.h"
#include "rocksdb/options.h"
#include "util/arena.h"
#include "util/autovector.h"
namespace rocksdb {

2
env/env_posix.cc vendored
View File

@ -49,12 +49,12 @@
#include "port/port.h"
#include "rocksdb/options.h"
#include "rocksdb/slice.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/compression_context_cache.h"
#include "util/logging.h"
#include "util/random.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#include "util/thread_local.h"
#include "util/threadpool_imp.h"

6
env/env_test.cc vendored
View File

@ -40,13 +40,13 @@
#include "env/env_chroot.h"
#include "port/port.h"
#include "rocksdb/env.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/coding.h"
#include "util/log_buffer.h"
#include "util/mutexlock.h"
#include "util/string_util.h"
#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);

2
env/io_posix.cc vendored
View File

@ -31,9 +31,9 @@
#include "monitoring/iostats_context_imp.h"
#include "port/port.h"
#include "rocksdb/slice.h"
#include "test_util/sync_point.h"
#include "util/coding.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#if defined(OS_LINUX) && !defined(F_SET_RW_HINT)
#define F_LINUX_SPECIFIC_BASE 1024

2
file/delete_scheduler.cc
View File

@ -13,9 +13,9 @@
#include "file/sst_file_manager_impl.h"
#include "port/port.h"
#include "rocksdb/env.h"
#include "test_util/sync_point.h"
#include "util/logging.h"
#include "util/mutexlock.h"
#include "test_util/sync_point.h"
namespace rocksdb {

2
file/delete_scheduler_test.cc
View File

@ -16,10 +16,10 @@
#include "file/sst_file_manager_impl.h"
#include "rocksdb/env.h"
#include "rocksdb/options.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
#include "test_util/testharness.h"
#include "test_util/testutil.h"
#include "util/string_util.h"
#ifndef ROCKSDB_LITE

2
file/filename.cc
View File

@ -17,11 +17,11 @@
#include <stdio.h>
#include <vector>
#include "rocksdb/env.h"
#include "test_util/sync_point.h"
#include "util/file_reader_writer.h"
#include "util/logging.h"
#include "util/stop_watch.h"
#include "util/string_util.h"
#include "test_util/sync_point.h"
namespace rocksdb {

2
file/sst_file_manager_impl.cc
View File

@ -16,8 +16,8 @@
#include "port/port.h"
#include "rocksdb/env.h"
#include "rocksdb/sst_file_manager.h"
#include "util/mutexlock.h"
#include "test_util/sync_point.h"
#include "util/mutexlock.h"
namespace rocksdb {

2
java/rocksjni/write_batch_test.cc
View File

@ -22,8 +22,8 @@
#include "rocksdb/write_buffer_manager.h"
#include "rocksjni/portal.h"
#include "table/scoped_arena_iterator.h"
#include "util/string_util.h"
#include "test_util/testharness.h"
#include "util/string_util.h"
/*
* Class: org_rocksdb_WriteBatchTest

0
util/allocator.h → memory/allocator.h
View File

4
util/arena.cc → memory/arena.cc
View File

@ -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/arena.h"
#include "memory/arena.h"
#ifdef ROCKSDB_MALLOC_USABLE_SIZE
#ifdef OS_FREEBSD
#include <malloc_np.h>
@ -21,8 +21,8 @@
#include <algorithm>
#include "port/port.h"
#include "rocksdb/env.h"
#include "util/logging.h"
#include "test_util/sync_point.h"
#include "util/logging.h"
namespace rocksdb {

8
util/arena.h → memory/arena.h
View File

@ -15,12 +15,12 @@
#ifndef OS_WIN
#include <sys/mman.h>
#endif
#include <cstddef>
#include <cerrno>
#include <vector>
#include <assert.h>
#include <stdint.h>
#include "util/allocator.h"
#include <cerrno>
#include <cstddef>
#include <vector>
#include "memory/allocator.h"
#include "util/mutexlock.h"
namespace rocksdb {

4
util/arena_test.cc → memory/arena_test.cc
View File

@ -7,9 +7,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "util/arena.h"
#include "util/random.h"
#include "memory/arena.h"
#include "test_util/testharness.h"
#include "util/random.h"
namespace rocksdb {

2
util/concurrent_arena.cc → memory/concurrent_arena.cc
View File

@ -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/concurrent_arena.h"
#include "memory/concurrent_arena.h"
#include <thread>
#include "port/port.h"
#include "util/random.h"

4
util/concurrent_arena.h → memory/concurrent_arena.h
View File

@ -11,9 +11,9 @@
#include <atomic>
#include <memory>
#include <utility>
#include "memory/allocator.h"
#include "memory/arena.h"
#include "port/likely.h"
#include "util/allocator.h"
#include "util/arena.h"
#include "util/core_local.h"
#include "util/mutexlock.h"
#include "util/thread_local.h"

2
util/jemalloc_nodump_allocator.cc → memory/jemalloc_nodump_allocator.cc
View File

@ -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/jemalloc_nodump_allocator.h"
#include "memory/jemalloc_nodump_allocator.h"
#include <string>
#include <thread>

0
util/jemalloc_nodump_allocator.h → memory/jemalloc_nodump_allocator.h
View File

0
util/memory_allocator.h → memory/memory_allocator.h
View File

0
util/memory_usage.h → memory/memory_usage.h
View File

4
memtable/alloc_tracker.cc
View File

@ -8,9 +8,9 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors.
#include <assert.h>
#include "memory/allocator.h"
#include "memory/arena.h"
#include "rocksdb/write_buffer_manager.h"
#include "util/allocator.h"
#include "util/arena.h"
namespace rocksdb {

2
memtable/hash_linklist_rep.cc
View File

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

8
memtable/hash_skiplist_rep.cc
View File

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

2
memtable/inlineskiplist.h
View File

@ -46,10 +46,10 @@
#include <algorithm>
#include <atomic>
#include <type_traits>
#include "memory/allocator.h"
#include "port/likely.h"
#include "port/port.h"
#include "rocksdb/slice.h"
#include "util/allocator.h"
#include "util/coding.h"
#include "util/random.h"

4
memtable/inlineskiplist_test.cc
View File

@ -10,11 +10,11 @@
#include "memtable/inlineskiplist.h"
#include <set>
#include <unordered_set>
#include "memory/concurrent_arena.h"
#include "rocksdb/env.h"
#include "util/concurrent_arena.h"
#include "test_util/testharness.h"
#include "util/hash.h"
#include "util/random.h"
#include "test_util/testharness.h"
namespace rocksdb {

4
memtable/memtablerep_bench.cc
View File

@ -28,6 +28,7 @@ int main() {
#include "db/dbformat.h"
#include "db/memtable.h"
#include "memory/arena.h"
#include "port/port.h"
#include "port/stack_trace.h"
#include "rocksdb/comparator.h"
@ -35,11 +36,10 @@ int main() {
#include "rocksdb/options.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/write_buffer_manager.h"
#include "util/arena.h"
#include "test_util/testutil.h"
#include "util/gflags_compat.h"
#include "util/mutexlock.h"
#include "util/stop_watch.h"
#include "test_util/testutil.h"
using GFLAGS_NAMESPACE::ParseCommandLineFlags;
using GFLAGS_NAMESPACE::RegisterFlagValidator;

4
memtable/skiplist.h
View File

@ -32,10 +32,10 @@
#pragma once
#include <assert.h>
#include <atomic>
#include <stdlib.h>
#include <atomic>
#include "memory/allocator.h"
#include "port/port.h"
#include "util/allocator.h"
#include "util/random.h"
namespace rocksdb {

4
memtable/skiplist_test.cc
View File

@ -9,11 +9,11 @@
#include "memtable/skiplist.h"
#include <set>
#include "memory/arena.h"
#include "rocksdb/env.h"
#include "util/arena.h"
#include "test_util/testharness.h"
#include "util/hash.h"
#include "util/random.h"
#include "test_util/testharness.h"
namespace rocksdb {

4
memtable/skiplistrep.cc
View File

@ -3,10 +3,10 @@
// COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory).
//
#include "memtable/inlineskiplist.h"
#include "db/memtable.h"
#include "memory/arena.h"
#include "memtable/inlineskiplist.h"
#include "rocksdb/memtablerep.h"
#include "util/arena.h"
namespace rocksdb {
namespace {

2
memtable/vectorrep.cc
View File

@ -12,8 +12,8 @@
#include <algorithm>
#include <type_traits>
#include "util/arena.h"
#include "db/memtable.h"
#include "memory/arena.h"
#include "memtable/stl_wrappers.h"
#include "port/port.h"
#include "util/mutexlock.h"

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