diff --git a/TARGETS b/TARGETS index 053845fd8..728b023ef 100644 --- a/TARGETS +++ b/TARGETS @@ -45,7 +45,9 @@ cpp_library( name = "rocksdb_lib", headers = AutoHeaders.RECURSIVE_GLOB, srcs = [ - "db/auto_roll_logger.cc", + "cache/clock_cache.cc", + "cache/lru_cache.cc", + "cache/sharded_cache.cc", "db/builder.cc", "db/c.cc", "db/column_family.cc", @@ -54,21 +56,24 @@ cpp_library( "db/compaction_iterator.cc", "db/compaction_job.cc", "db/compaction_picker.cc", + "db/compaction_picker_universal.cc", "db/convenience.cc", - "db/range_del_aggregator.cc", "db/db_filesnapshot.cc", - "db/dbformat.cc", "db/db_impl.cc", + "db/db_impl_write.cc", + "db/db_impl_compaction_flush.cc", + "db/db_impl_files.cc", + "db/db_impl_open.cc", "db/db_impl_debug.cc", - "db/db_impl_readonly.cc", "db/db_impl_experimental.cc", + "db/db_impl_readonly.cc", "db/db_info_dumper.cc", "db/db_iter.cc", - "db/external_sst_file_ingestion_job.cc", - "db/experimental.cc", + "db/dbformat.cc", "db/event_helpers.cc", + "db/experimental.cc", + "db/external_sst_file_ingestion_job.cc", "db/file_indexer.cc", - "db/filename.cc", "db/flush_job.cc", "db/flush_scheduler.cc", "db/forward_iterator.cc", @@ -76,11 +81,11 @@ cpp_library( "db/log_reader.cc", "db/log_writer.cc", "db/managed_iterator.cc", - "db/memtable_allocator.cc", "db/memtable.cc", "db/memtable_list.cc", "db/merge_helper.cc", "db/merge_operator.cc", + "db/range_del_aggregator.cc", "db/repair.cc", "db/snapshot_impl.cc", "db/table_cache.cc", @@ -94,20 +99,45 @@ cpp_library( "db/write_batch_base.cc", "db/write_controller.cc", "db/write_thread.cc", + "env/env.cc", + "env/env_chroot.cc", + "env/env_hdfs.cc", + "env/env_posix.cc", + "env/io_posix.cc", + "env/memenv.cc", "memtable/hash_cuckoo_rep.cc", "memtable/hash_linklist_rep.cc", "memtable/hash_skiplist_rep.cc", + "memtable/memtable_allocator.cc", "memtable/skiplistrep.cc", "memtable/vectorrep.cc", - "port/stack_trace.cc", + "monitoring/histogram.cc", + "monitoring/histogram_windowing.cc", + "monitoring/instrumented_mutex.cc", + "monitoring/iostats_context.cc", + "monitoring/perf_context.cc", + "monitoring/perf_level.cc", + "monitoring/statistics.cc", + "monitoring/thread_status_impl.cc", + "monitoring/thread_status_updater.cc", + "monitoring/thread_status_updater_debug.cc", + "monitoring/thread_status_util.cc", + "monitoring/thread_status_util_debug.cc", + "options/cf_options.cc", + "options/db_options.cc", + "options/options.cc", + "options/options_helper.cc", + "options/options_parser.cc", + "options/options_sanity_check.cc", "port/port_posix.cc", + "port/stack_trace.cc", "table/adaptive_table_factory.cc", + "table/block.cc", "table/block_based_filter_block.cc", "table/block_based_table_builder.cc", "table/block_based_table_factory.cc", "table/block_based_table_reader.cc", "table/block_builder.cc", - "table/block.cc", "table/block_prefix_index.cc", "table/bloom_block.cc", "table/cuckoo_table_builder.cc", @@ -121,113 +151,88 @@ cpp_library( "table/iterator.cc", "table/merging_iterator.cc", "table/meta_blocks.cc", - "table/sst_file_writer.cc", "table/partitioned_filter_block.cc", + "table/persistent_cache_helper.cc", "table/plain_table_builder.cc", "table/plain_table_factory.cc", "table/plain_table_index.cc", "table/plain_table_key_coding.cc", "table/plain_table_reader.cc", - "table/persistent_cache_helper.cc", + "table/sst_file_writer.cc", "table/table_properties.cc", "table/two_level_iterator.cc", "tools/dump/db_dump_tool.cc", "util/arena.cc", + "util/auto_roll_logger.cc", "util/bloom.cc", "util/build_version.cc", - "util/cf_options.cc", - "util/clock_cache.cc", "util/coding.cc", - "util/comparator.cc", "util/compaction_job_stats_impl.cc", + "util/comparator.cc", "util/concurrent_arena.cc", "util/crc32c.cc", - "util/db_options.cc", "util/delete_scheduler.cc", "util/dynamic_bloom.cc", - "util/env.cc", - "util/env_chroot.cc", - "util/env_hdfs.cc", - "util/env_posix.cc", "util/event_logger.cc", - "util/file_util.cc", "util/file_reader_writer.cc", + "util/file_util.cc", + "util/filename.cc", "util/filter_policy.cc", "util/hash.cc", - "util/histogram.cc", - "util/histogram_windowing.cc", - "util/instrumented_mutex.cc", - "util/iostats_context.cc", - "util/io_posix.cc", "util/log_buffer.cc", - "util/logging.cc", - "util/lru_cache.cc", - "util/memenv.cc", "util/murmurhash.cc", - "util/options.cc", - "util/options_helper.cc", - "util/options_parser.cc", - "util/options_sanity_check.cc", - "util/perf_context.cc", - "util/perf_level.cc", "util/random.cc", "util/rate_limiter.cc", - "util/sharded_cache.cc", "util/slice.cc", "util/sst_file_manager_impl.cc", - "util/statistics.cc", "util/status.cc", "util/status_message.cc", "util/string_util.cc", "util/sync_point.cc", "util/thread_local.cc", - "util/thread_status_impl.cc", - "util/thread_status_updater.cc", - "util/thread_status_updater_debug.cc", - "util/thread_status_util.cc", - "util/thread_status_util_debug.cc", "util/threadpool_imp.cc", "util/transaction_test_util.cc", "util/xxhash.cc", "utilities/backupable/backupable_db.cc", "utilities/blob_db/blob_db.cc", - "utilities/convenience/info_log_finder.cc", "utilities/checkpoint/checkpoint.cc", "utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc", + "utilities/convenience/info_log_finder.cc", + "utilities/date_tiered/date_tiered_db_impl.cc", "utilities/document/document_db.cc", - "utilities/document/json_document_builder.cc", "utilities/document/json_document.cc", + "utilities/document/json_document_builder.cc", "utilities/env_mirror.cc", + "utilities/env_timed.cc", "utilities/geodb/geodb_impl.cc", "utilities/leveldb_options/leveldb_options.cc", "utilities/lua/rocks_lua_compaction_filter.cc", "utilities/memory/memory_util.cc", - "utilities/merge_operators/put.cc", "utilities/merge_operators/max.cc", - "utilities/merge_operators/string_append/stringappend2.cc", + "utilities/merge_operators/put.cc", "utilities/merge_operators/string_append/stringappend.cc", + "utilities/merge_operators/string_append/stringappend2.cc", "utilities/merge_operators/uint64add.cc", "utilities/option_change_migration/option_change_migration.cc", "utilities/options/options_util.cc", - "utilities/persistent_cache/persistent_cache_tier.cc", - "utilities/persistent_cache/volatile_tier_impl.cc", + "utilities/persistent_cache/block_cache_tier.cc", "utilities/persistent_cache/block_cache_tier_file.cc", "utilities/persistent_cache/block_cache_tier_metadata.cc", - "utilities/persistent_cache/block_cache_tier.cc", + "utilities/persistent_cache/persistent_cache_tier.cc", + "utilities/persistent_cache/volatile_tier_impl.cc", "utilities/redis/redis_lists.cc", "utilities/simulator_cache/sim_cache.cc", "utilities/spatialdb/spatial_db.cc", "utilities/table_properties_collectors/compact_on_deletion_collector.cc", - "utilities/transactions/optimistic_transaction_impl.cc", "utilities/transactions/optimistic_transaction_db_impl.cc", + "utilities/transactions/optimistic_transaction_impl.cc", "utilities/transactions/transaction_base.cc", "utilities/transactions/transaction_db_impl.cc", "utilities/transactions/transaction_db_mutex_impl.cc", - "utilities/transactions/transaction_lock_mgr.cc", "utilities/transactions/transaction_impl.cc", + "utilities/transactions/transaction_lock_mgr.cc", "utilities/transactions/transaction_util.cc", "utilities/ttl/db_ttl_impl.cc", - "utilities/date_tiered/date_tiered_db_impl.cc", "utilities/write_batch_with_index/write_batch_with_index.cc", "utilities/write_batch_with_index/write_batch_with_index_internal.cc", "tools/ldb_cmd.cc", @@ -244,8 +249,8 @@ cpp_library( name = "rocksdb_test_lib", headers = AutoHeaders.RECURSIVE_GLOB, srcs = [ + "env/mock_env.cc", "table/mock_table.cc", - "util/mock_env.cc", "util/fault_injection_test_env.cc", "util/testharness.cc", "util/testutil.cc", @@ -276,7 +281,7 @@ cpp_library( cpp_library( name = "env_basic_test_lib", headers = AutoHeaders.RECURSIVE_GLOB, - srcs = ["util/env_basic_test.cc"], + srcs = ["env/env_basic_test.cc"], deps = [":rocksdb_test_lib"], preprocessor_flags = rocksdb_preprocessor_flags, compiler_flags = rocksdb_compiler_flags, @@ -285,7 +290,7 @@ cpp_library( # [test_name, test_src, test_type] ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], - ['cache_test', 'util/cache_test.cc', 'serial'], + ['cache_test', 'cache/cache_test.cc', 'serial'], ['options_file_test', 'db/options_file_test.cc', 'serial'], ['compaction_picker_test', 'db/compaction_picker_test.cc', 'serial'], ['corruption_test', 'db/corruption_test.cc', 'serial'], @@ -296,8 +301,8 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['document_db_test', 'utilities/document/document_db_test.cc', 'serial'], ['event_logger_test', 'util/event_logger_test.cc', 'serial'], ['coding_test', 'util/coding_test.cc', 'serial'], - ['statistics_test', 'util/statistics_test.cc', 'serial'], - ['options_settable_test', 'util/options_settable_test.cc', 'serial'], + ['statistics_test', 'monitoring/statistics_test.cc', 'serial'], + ['options_settable_test', 'options/options_settable_test.cc', 'serial'], ['sst_dump_test', 'tools/sst_dump_test.cc', 'serial'], ['column_aware_encoding_test', 'utilities/column_aware_encoding_test.cc', @@ -315,7 +320,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['db_options_test', 'db/db_options_test.cc', 'serial'], ['object_registry_test', 'utilities/object_registry_test.cc', 'serial'], ['blob_db_test', 'utilities/blob_db/blob_db_test.cc', 'serial'], - ['auto_roll_logger_test', 'db/auto_roll_logger_test.cc', 'serial'], + ['auto_roll_logger_test', 'util/auto_roll_logger_test.cc', 'serial'], ['dbformat_test', 'db/dbformat_test.cc', 'serial'], ['write_batch_with_index_test', 'utilities/write_batch_with_index/write_batch_with_index_test.cc', @@ -330,7 +335,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['external_sst_file_basic_test', 'db/external_sst_file_basic_test.cc', 'serial'], - ['options_test', 'util/options_test.cc', 'serial'], + ['options_test', 'options/options_test.cc', 'serial'], ['perf_context_test', 'db/perf_context_test.cc', 'serial'], ['db_block_cache_test', 'db/db_block_cache_test.cc', 'serial'], ['heap_test', 'util/heap_test.cc', 'serial'], @@ -359,7 +364,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['cuckoo_table_reader_test', 'table/cuckoo_table_reader_test.cc', 'serial'], ['slice_transform_test', 'util/slice_transform_test.cc', 'serial'], ['cuckoo_table_db_test', 'db/cuckoo_table_db_test.cc', 'serial'], - ['inlineskiplist_test', 'db/inlineskiplist_test.cc', 'parallel'], + ['inlineskiplist_test', 'memtable/inlineskiplist_test.cc', 'parallel'], ['optimistic_transaction_test', 'utilities/transactions/optimistic_transaction_test.cc', 'serial'], @@ -380,7 +385,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['rate_limiter_test', 'util/rate_limiter_test.cc', 'serial'], ['external_sst_file_test', 'db/external_sst_file_test.cc', 'parallel'], ['compaction_job_test', 'db/compaction_job_test.cc', 'serial'], - ['mock_env_test', 'util/mock_env_test.cc', 'serial'], + ['mock_env_test', 'env/mock_env_test.cc', 'serial'], ['db_table_properties_test', 'db/db_table_properties_test.cc', 'serial'], ['db_compaction_test', 'db/db_compaction_test.cc', 'parallel'], ['arena_test', 'util/arena_test.cc', 'serial'], @@ -394,6 +399,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['file_indexer_test', 'db/file_indexer_test.cc', 'serial'], ['memory_test', 'utilities/memory/memory_test.cc', 'serial'], ['log_test', 'db/log_test.cc', 'serial'], + ['env_timed_test', 'utilities/env_timed_test.cc', 'serial'], ['deletefile_test', 'db/deletefile_test.cc', 'serial'], ['partitioned_filter_block_test', 'table/partitioned_filter_block_test.cc', @@ -418,26 +424,26 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['compact_on_deletion_collector_test', 'utilities/table_properties_collectors/compact_on_deletion_collector_test.cc', 'serial'], - ['env_test', 'util/env_test.cc', 'serial'], + ['env_test', 'env/env_test.cc', 'serial'], ['db_wal_test', 'db/db_wal_test.cc', 'parallel'], ['sim_cache_test', 'utilities/simulator_cache/sim_cache_test.cc', 'serial'], ['db_memtable_test', 'db/db_memtable_test.cc', 'serial'], ['db_universal_compaction_test', 'db/db_universal_compaction_test.cc', 'parallel'], - ['histogram_test', 'util/histogram_test.cc', 'serial'], + ['histogram_test', 'monitoring/histogram_test.cc', 'serial'], ['util_merge_operators_test', 'utilities/util_merge_operators_test.cc', 'serial'], ['fault_injection_test', 'db/fault_injection_test.cc', 'parallel'], - ['env_basic_test', 'util/env_basic_test.cc', 'serial'], - ['iostats_context_test', 'util/iostats_context_test.cc', 'serial'], + ['env_basic_test', 'env/env_basic_test.cc', 'serial'], + ['iostats_context_test', 'monitoring/iostats_context_test.cc', 'serial'], ['memtable_list_test', 'db/memtable_list_test.cc', 'serial'], ['column_family_test', 'db/column_family_test.cc', 'serial'], ['db_properties_test', 'db/db_properties_test.cc', 'serial'], ['version_edit_test', 'db/version_edit_test.cc', 'serial'], - ['skiplist_test', 'db/skiplist_test.cc', 'serial'], - ['lru_cache_test', 'util/lru_cache_test.cc', 'serial'], + ['skiplist_test', 'memtable/skiplist_test.cc', 'serial'], + ['lru_cache_test', 'cache/lru_cache_test.cc', 'serial'], ['plain_table_db_test', 'db/plain_table_db_test.cc', 'serial']]