diff --git a/CMakeLists.txt b/CMakeLists.txt index 39b135a69..cbbde8eda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -714,9 +714,9 @@ set(TESTS utilities/lua/rocks_lua_test.cc utilities/memory/memory_test.cc utilities/merge_operators/cassandra/cassandra_merge_test.cc - utilities/merge_operators/cassandra/format_test.cc - utilities/merge_operators/cassandra/row_merge_test.cc - utilities/merge_operators/cassandra/serialize_test.cc + utilities/merge_operators/cassandra/cassandra_format_test.cc + utilities/merge_operators/cassandra/cassandra_row_merge_test.cc + utilities/merge_operators/cassandra/cassandra_serialize_test.cc utilities/merge_operators/string_append/stringappend_test.cc utilities/object_registry_test.cc utilities/option_change_migration/option_change_migration_test.cc diff --git a/Makefile b/Makefile index 20e012174..bf0d836f8 100644 --- a/Makefile +++ b/Makefile @@ -365,6 +365,7 @@ TESTS = \ db_statistics_test \ db_write_test \ autovector_test \ + blob_db_test \ cleanable_test \ column_family_test \ table_properties_collector_test \ @@ -995,16 +996,16 @@ option_change_migration_test: utilities/option_change_migration/option_change_mi stringappend_test: utilities/merge_operators/string_append/stringappend_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) -cassandra_format_test: utilities/merge_operators/cassandra/format_test.o $(LIBOBJECTS) $(TESTHARNESS) +cassandra_format_test: utilities/merge_operators/cassandra/cassandra_format_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) cassandra_merge_test: utilities/merge_operators/cassandra/cassandra_merge_test.o utilities/merge_operators/cassandra/test_utils.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) -cassandra_row_merge_test: utilities/merge_operators/cassandra/row_merge_test.o utilities/merge_operators/cassandra/test_utils.o $(LIBOBJECTS) $(TESTHARNESS) +cassandra_row_merge_test: utilities/merge_operators/cassandra/cassandra_row_merge_test.o utilities/merge_operators/cassandra/test_utils.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) -cassandra_serialize_test: utilities/merge_operators/cassandra/serialize_test.o $(LIBOBJECTS) $(TESTHARNESS) +cassandra_serialize_test: utilities/merge_operators/cassandra/cassandra_serialize_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) redis_test: utilities/redis/redis_lists_test.o $(LIBOBJECTS) $(TESTHARNESS) diff --git a/TARGETS b/TARGETS index 0fe3b6e54..f577662c5 100644 --- a/TARGETS +++ b/TARGETS @@ -270,6 +270,7 @@ cpp_library( "util/testharness.cc", "util/testutil.cc", "db/db_test_util.cc", + "utilities/merge_operators/cassandra/test_utils.cc", "utilities/col_buf_encoder.cc", "utilities/col_buf_decoder.cc", "utilities/column_aware_encoding_util.cc", @@ -304,171 +305,181 @@ cpp_library( ) # [test_name, test_src, test_type] -ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], +ROCKS_TESTS = [['arena_test', 'util/arena_test.cc', 'serial'], + ['auto_roll_logger_test', 'util/auto_roll_logger_test.cc', 'serial'], + ['autovector_test', 'util/autovector_test.cc', 'serial'], + ['backupable_db_test', + 'utilities/backupable/backupable_db_test.cc', + 'parallel'], + ['blob_db_test', 'utilities/blob_db/blob_db_test.cc', 'serial'], + ['block_based_filter_block_test', + 'table/block_based_filter_block_test.cc', + 'serial'], + ['block_test', 'table/block_test.cc', 'serial'], + ['bloom_test', 'util/bloom_test.cc', 'serial'], + ['c_test', 'db/c_test.c', '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'], - ['db_log_iter_test', 'db/db_log_iter_test.cc', 'serial'], - ['thread_list_test', 'util/thread_list_test.cc', 'serial'], - ['document_db_test', 'utilities/document/document_db_test.cc', 'serial'], - ['db_encryption_test', 'db/db_encryption_test.cc', 'serial'], - ['coding_test', 'util/coding_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', + ['cassandra_format_test', + 'utilities/merge_operators/cassandra/cassandra_format_test.cc', 'serial'], - ['db_iterator_test', 'db/db_iterator_test.cc', 'serial'], - ['db_sst_test', 'db/db_sst_test.cc', 'parallel'], ['cassandra_merge_test', 'utilities/merge_operators/cassandra/cassandra_merge_test.cc', 'serial'], - ['geodb_test', 'utilities/geodb/geodb_test.cc', 'serial'], - ['listener_test', 'db/listener_test.cc', 'serial'], - ['write_callback_test', 'db/write_callback_test.cc', 'serial'], - ['version_set_test', 'db/version_set_test.cc', 'serial'], - ['full_filter_block_test', 'table/full_filter_block_test.cc', 'serial'], - ['cleanable_test', 'table/cleanable_test.cc', 'serial'], - ['checkpoint_test', 'utilities/checkpoint/checkpoint_test.cc', 'serial'], - ['compact_files_test', 'db/compact_files_test.cc', 'serial'], - ['db_options_test', 'db/db_options_test.cc', 'serial'], - ['object_registry_test', 'utilities/object_registry_test.cc', 'serial'], - ['auto_roll_logger_test', 'util/auto_roll_logger_test.cc', 'serial'], - ['dbformat_test', 'db/dbformat_test.cc', 'serial'], - ['db_write_test', 'db/db_write_test.cc', 'serial'], - ['write_batch_with_index_test', - 'utilities/write_batch_with_index/write_batch_with_index_test.cc', + ['cassandra_row_merge_test', + 'utilities/merge_operators/cassandra/cassandra_row_merge_test.cc', 'serial'], - ['util_merge_operators_test', - 'utilities/util_merge_operators_test.cc', + ['cassandra_serialize_test', + 'utilities/merge_operators/cassandra/cassandra_serialize_test.cc', 'serial'], - ['file_reader_writer_test', 'util/file_reader_writer_test.cc', 'serial'], - ['table_properties_collector_test', - 'db/table_properties_collector_test.cc', + ['checkpoint_test', 'utilities/checkpoint/checkpoint_test.cc', 'serial'], + ['cleanable_test', 'table/cleanable_test.cc', 'serial'], + ['coding_test', 'util/coding_test.cc', 'serial'], + ['column_aware_encoding_test', + 'utilities/column_aware_encoding_test.cc', 'serial'], - ['json_document_test', 'utilities/document/json_document_test.cc', 'serial'], - ['repair_test', 'db/repair_test.cc', 'serial'], - ['persistent_cache_test', - 'utilities/persistent_cache/persistent_cache_test.cc', - 'parallel'], + ['column_family_test', 'db/column_family_test.cc', 'serial'], + ['compact_files_test', 'db/compact_files_test.cc', 'serial'], + ['compact_on_deletion_collector_test', + 'utilities/table_properties_collectors/compact_on_deletion_collector_test.cc', + 'serial'], + ['compaction_iterator_test', 'db/compaction_iterator_test.cc', 'serial'], + ['compaction_job_stats_test', 'db/compaction_job_stats_test.cc', 'serial'], + ['compaction_job_test', 'db/compaction_job_test.cc', 'serial'], + ['compaction_picker_test', 'db/compaction_picker_test.cc', 'serial'], + ['comparator_db_test', 'db/comparator_db_test.cc', 'serial'], + ['corruption_test', 'db/corruption_test.cc', 'serial'], + ['crc32c_test', 'util/crc32c_test.cc', 'serial'], + ['cuckoo_table_builder_test', 'table/cuckoo_table_builder_test.cc', 'serial'], + ['cuckoo_table_db_test', 'db/cuckoo_table_db_test.cc', 'serial'], + ['cuckoo_table_reader_test', 'table/cuckoo_table_reader_test.cc', 'serial'], + ['date_tiered_test', 'utilities/date_tiered/date_tiered_test.cc', 'serial'], + ['db_basic_test', 'db/db_basic_test.cc', 'serial'], + ['db_block_cache_test', 'db/db_block_cache_test.cc', 'serial'], ['db_bloom_filter_test', 'db/db_bloom_filter_test.cc', 'serial'], + ['db_compaction_filter_test', 'db/db_compaction_filter_test.cc', 'parallel'], + ['db_compaction_test', 'db/db_compaction_test.cc', 'parallel'], + ['db_dynamic_level_test', 'db/db_dynamic_level_test.cc', 'serial'], + ['db_encryption_test', 'db/db_encryption_test.cc', 'serial'], + ['db_flush_test', 'db/db_flush_test.cc', 'serial'], + ['db_inplace_update_test', 'db/db_inplace_update_test.cc', 'serial'], + ['db_io_failure_test', 'db/db_io_failure_test.cc', 'serial'], + ['db_iter_test', 'db/db_iter_test.cc', 'serial'], + ['db_iterator_test', 'db/db_iterator_test.cc', 'serial'], + ['db_log_iter_test', 'db/db_log_iter_test.cc', 'serial'], + ['db_memtable_test', 'db/db_memtable_test.cc', 'serial'], + ['db_merge_operator_test', 'db/db_merge_operator_test.cc', 'serial'], + ['db_options_test', 'db/db_options_test.cc', 'serial'], + ['db_properties_test', 'db/db_properties_test.cc', 'serial'], + ['db_range_del_test', 'db/db_range_del_test.cc', 'serial'], + ['db_sst_test', 'db/db_sst_test.cc', 'parallel'], + ['db_statistics_test', 'db/db_statistics_test.cc', 'serial'], + ['db_table_properties_test', 'db/db_table_properties_test.cc', 'serial'], + ['db_tailing_iter_test', 'db/db_tailing_iter_test.cc', 'serial'], + ['db_test', 'db/db_test.cc', 'parallel'], + ['db_test2', 'db/db_test2.cc', 'serial'], + ['db_universal_compaction_test', + 'db/db_universal_compaction_test.cc', + 'parallel'], + ['db_wal_test', 'db/db_wal_test.cc', 'parallel'], + ['db_write_test', 'db/db_write_test.cc', 'serial'], + ['dbformat_test', 'db/dbformat_test.cc', 'serial'], + ['delete_scheduler_test', 'util/delete_scheduler_test.cc', 'serial'], + ['deletefile_test', 'db/deletefile_test.cc', 'serial'], + ['document_db_test', 'utilities/document/document_db_test.cc', 'serial'], + ['dynamic_bloom_test', 'util/dynamic_bloom_test.cc', 'serial'], + ['env_basic_test', 'env/env_basic_test.cc', 'serial'], + ['env_test', 'env/env_test.cc', 'serial'], + ['env_timed_test', 'utilities/env_timed_test.cc', 'serial'], + ['event_logger_test', 'util/event_logger_test.cc', 'serial'], ['external_sst_file_basic_test', 'db/external_sst_file_basic_test.cc', 'serial'], - ['write_buffer_manager_test', - 'memtable/write_buffer_manager_test.cc', + ['external_sst_file_test', 'db/external_sst_file_test.cc', 'parallel'], + ['fault_injection_test', 'db/fault_injection_test.cc', 'parallel'], + ['file_indexer_test', 'db/file_indexer_test.cc', 'serial'], + ['file_reader_writer_test', 'util/file_reader_writer_test.cc', 'serial'], + ['filelock_test', 'util/filelock_test.cc', 'serial'], + ['filename_test', 'db/filename_test.cc', 'serial'], + ['flush_job_test', 'db/flush_job_test.cc', 'serial'], + ['full_filter_block_test', 'table/full_filter_block_test.cc', 'serial'], + ['geodb_test', 'utilities/geodb/geodb_test.cc', 'serial'], + ['hash_table_test', + 'utilities/persistent_cache/hash_table_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'], - ['db_test2', 'db/db_test2.cc', 'serial'], - ['filelock_test', 'util/filelock_test.cc', 'serial'], - ['write_controller_test', 'db/write_controller_test.cc', 'serial'], - ['event_logger_test', 'util/event_logger_test.cc', 'serial'], - ['spatial_db_test', 'utilities/spatialdb/spatial_db_test.cc', 'serial'], - ['c_test', 'db/c_test.c', 'serial'], - ['range_del_aggregator_test', 'db/range_del_aggregator_test.cc', 'serial'], - ['options_util_test', 'utilities/options/options_util_test.cc', 'serial'], - ['date_tiered_test', 'utilities/date_tiered/date_tiered_test.cc', 'serial'], + ['histogram_test', 'monitoring/histogram_test.cc', 'serial'], + ['inlineskiplist_test', 'memtable/inlineskiplist_test.cc', 'parallel'], + ['iostats_context_test', 'monitoring/iostats_context_test.cc', 'serial'], + ['json_document_test', 'utilities/document/json_document_test.cc', 'serial'], ['ldb_cmd_test', 'tools/ldb_cmd_test.cc', 'serial'], - ['db_test', 'db/db_test.cc', 'parallel'], - ['block_based_filter_block_test', - 'table/block_based_filter_block_test.cc', - 'serial'], + ['listener_test', 'db/listener_test.cc', 'serial'], + ['log_test', 'db/log_test.cc', 'serial'], + ['lru_cache_test', 'cache/lru_cache_test.cc', 'serial'], + ['manual_compaction_test', 'db/manual_compaction_test.cc', 'parallel'], + ['memory_test', 'utilities/memory/memory_test.cc', 'serial'], + ['memtable_list_test', 'db/memtable_list_test.cc', 'serial'], + ['merge_helper_test', 'db/merge_helper_test.cc', 'serial'], ['merge_test', 'db/merge_test.cc', 'serial'], - ['bloom_test', 'util/bloom_test.cc', 'serial'], - ['block_test', 'table/block_test.cc', 'serial'], - ['cuckoo_table_builder_test', 'table/cuckoo_table_builder_test.cc', 'serial'], - ['backupable_db_test', - 'utilities/backupable/backupable_db_test.cc', - 'parallel'], - ['db_flush_test', 'db/db_flush_test.cc', 'serial'], - ['filename_test', 'db/filename_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', 'memtable/inlineskiplist_test.cc', 'parallel'], + ['merger_test', 'table/merger_test.cc', 'serial'], + ['mock_env_test', 'env/mock_env_test.cc', 'serial'], + ['object_registry_test', 'utilities/object_registry_test.cc', 'serial'], ['optimistic_transaction_test', 'utilities/transactions/optimistic_transaction_test.cc', 'serial'], - ['hash_table_test', - 'utilities/persistent_cache/hash_table_test.cc', - 'serial'], - ['db_dynamic_level_test', 'db/db_dynamic_level_test.cc', 'serial'], ['option_change_migration_test', 'utilities/option_change_migration/option_change_migration_test.cc', 'serial'], - ['db_inplace_update_test', 'db/db_inplace_update_test.cc', 'serial'], - ['autovector_test', 'util/autovector_test.cc', 'serial'], - ['db_iter_test', 'db/db_iter_test.cc', 'serial'], - ['flush_job_test', 'db/flush_job_test.cc', 'serial'], - ['wal_manager_test', 'db/wal_manager_test.cc', 'serial'], - ['write_batch_test', 'db/write_batch_test.cc', 'serial'], - ['crc32c_test', 'util/crc32c_test.cc', 'serial'], + ['options_file_test', 'db/options_file_test.cc', 'serial'], + ['options_settable_test', 'options/options_settable_test.cc', 'serial'], + ['options_test', 'options/options_test.cc', 'serial'], + ['options_util_test', 'utilities/options/options_util_test.cc', 'serial'], + ['partitioned_filter_block_test', + 'table/partitioned_filter_block_test.cc', + 'serial'], + ['perf_context_test', 'db/perf_context_test.cc', 'serial'], + ['persistent_cache_test', + 'utilities/persistent_cache/persistent_cache_test.cc', + 'parallel'], + ['plain_table_db_test', 'db/plain_table_db_test.cc', 'serial'], + ['prefix_test', 'db/prefix_test.cc', 'serial'], + ['range_del_aggregator_test', 'db/range_del_aggregator_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', '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'], + ['reduce_levels_test', 'tools/reduce_levels_test.cc', 'serial'], + ['repair_test', 'db/repair_test.cc', 'serial'], + ['sim_cache_test', 'utilities/simulator_cache/sim_cache_test.cc', 'serial'], + ['skiplist_test', 'memtable/skiplist_test.cc', 'serial'], + ['slice_transform_test', 'util/slice_transform_test.cc', 'serial'], + ['spatial_db_test', 'utilities/spatialdb/spatial_db_test.cc', 'serial'], + ['sst_dump_test', 'tools/sst_dump_test.cc', 'serial'], + ['statistics_test', 'monitoring/statistics_test.cc', 'serial'], ['stringappend_test', 'utilities/merge_operators/string_append/stringappend_test.cc', 'serial'], - ['reduce_levels_test', 'tools/reduce_levels_test.cc', 'serial'], - ['prefix_test', 'db/prefix_test.cc', 'serial'], - ['ttl_test', 'utilities/ttl/ttl_test.cc', 'serial'], - ['merge_helper_test', 'db/merge_helper_test.cc', 'serial'], - ['file_indexer_test', 'db/file_indexer_test.cc', 'serial'], - ['db_statistics_test', 'db/db_statistics_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', + ['table_properties_collector_test', + 'db/table_properties_collector_test.cc', 'serial'], - ['comparator_db_test', 'db/comparator_db_test.cc', 'serial'], - ['compaction_job_stats_test', 'db/compaction_job_stats_test.cc', 'serial'], - ['thread_local_test', 'util/thread_local_test.cc', 'serial'], - ['version_builder_test', 'db/version_builder_test.cc', 'serial'], - ['db_range_del_test', 'db/db_range_del_test.cc', 'serial'], ['table_test', 'table/table_test.cc', 'parallel'], - ['db_tailing_iter_test', 'db/db_tailing_iter_test.cc', 'serial'], - ['compaction_iterator_test', 'db/compaction_iterator_test.cc', 'serial'], - ['db_compaction_filter_test', 'db/db_compaction_filter_test.cc', 'parallel'], - ['dynamic_bloom_test', 'util/dynamic_bloom_test.cc', 'serial'], - ['db_basic_test', 'db/db_basic_test.cc', 'serial'], - ['db_merge_operator_test', 'db/db_merge_operator_test.cc', 'serial'], - ['manual_compaction_test', 'db/manual_compaction_test.cc', 'parallel'], - ['delete_scheduler_test', 'util/delete_scheduler_test.cc', 'serial'], + ['thread_list_test', 'util/thread_list_test.cc', 'serial'], + ['thread_local_test', 'util/thread_local_test.cc', 'serial'], + ['timer_queue_test', 'util/timer_queue_test.cc', 'serial'], ['transaction_test', 'utilities/transactions/transaction_test.cc', 'serial'], - ['db_io_failure_test', 'db/db_io_failure_test.cc', 'serial'], - ['corruption_test', 'db/corruption_test.cc', 'serial'], - ['compact_on_deletion_collector_test', - 'utilities/table_properties_collectors/compact_on_deletion_collector_test.cc', + ['ttl_test', 'utilities/ttl/ttl_test.cc', 'serial'], + ['util_merge_operators_test', + 'utilities/util_merge_operators_test.cc', 'serial'], - ['env_test', 'env/env_test.cc', 'serial'], - ['db_wal_test', 'db/db_wal_test.cc', 'parallel'], - ['timer_queue_test', 'util/timer_queue_test.cc', 'serial'], - ['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', 'monitoring/histogram_test.cc', 'serial'], - ['fault_injection_test', 'db/fault_injection_test.cc', 'parallel'], - ['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_builder_test', 'db/version_builder_test.cc', 'serial'], ['version_edit_test', 'db/version_edit_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']] + ['version_set_test', 'db/version_set_test.cc', 'serial'], + ['wal_manager_test', 'db/wal_manager_test.cc', 'serial'], + ['write_batch_test', 'db/write_batch_test.cc', 'serial'], + ['write_batch_with_index_test', + 'utilities/write_batch_with_index/write_batch_with_index_test.cc', + 'serial'], + ['write_buffer_manager_test', + 'memtable/write_buffer_manager_test.cc', + 'serial'], + ['write_callback_test', 'db/write_callback_test.cc', 'serial'], + ['write_controller_test', 'db/write_controller_test.cc', 'serial']] # Generate a test rule for each entry in ROCKS_TESTS diff --git a/buckifier/buckify_rocksdb.py b/buckifier/buckify_rocksdb.py index d31ffe346..a3c8be3b1 100644 --- a/buckifier/buckify_rocksdb.py +++ b/buckifier/buckify_rocksdb.py @@ -84,7 +84,7 @@ def get_tests(repo_path): else: # we consumed all the parallel tests break - + return tests @@ -122,7 +122,7 @@ def generate_targets(repo_path): [":rocksdb_lib"]) # test for every test we found in the Makefile - for test in tests: + for test in sorted(tests): match_src = [src for src in cc_files if ("/%s.c" % test) in src] if len(match_src) == 0: print(ColorString.warning("Cannot find .cc file for %s" % test)) diff --git a/src.mk b/src.mk index 7ada535b6..22414f128 100644 --- a/src.mk +++ b/src.mk @@ -224,7 +224,8 @@ EXP_LIB_SOURCES = \ TEST_LIB_SOURCES = \ util/testharness.cc \ util/testutil.cc \ - db/db_test_util.cc + db/db_test_util.cc \ + utilities/merge_operators/cassandra/test_utils.cc \ MAIN_SOURCES = \ cache/cache_bench.cc \ @@ -323,7 +324,7 @@ MAIN_SOURCES = \ util/log_write_bench.cc \ util/rate_limiter_test.cc \ util/slice_transform_test.cc \ - util/timer_queue_test.cc \ + util/timer_queue_test.cc \ util/thread_list_test.cc \ util/thread_local_test.cc \ utilities/backupable/backupable_db_test.cc \ @@ -340,11 +341,11 @@ MAIN_SOURCES = \ utilities/merge_operators/string_append/stringappend_test.cc \ utilities/merge_operators/cassandra/cassandra_merge_test.cc \ utilities/merge_operators/cassandra/test_utils.cc \ - utilities/merge_operators/cassandra/format_test.cc \ - utilities/merge_operators/cassandra/row_merge_test.cc \ - utilities/merge_operators/cassandra/serialize_test.cc \ + utilities/merge_operators/cassandra/cassandra_format_test.cc \ + utilities/merge_operators/cassandra/cassandra_row_merge_test.cc \ + utilities/merge_operators/cassandra/cassandra_serialize_test.cc \ utilities/object_registry_test.cc \ - utilities/option_change_migration/option_change_migration_test.cc \ + utilities/option_change_migration/option_change_migration_test.cc \ utilities/options/options_util_test.cc \ utilities/redis/redis_lists_test.cc \ utilities/simulator_cache/sim_cache_test.cc \ diff --git a/utilities/merge_operators/cassandra/format_test.cc b/utilities/merge_operators/cassandra/cassandra_format_test.cc similarity index 100% rename from utilities/merge_operators/cassandra/format_test.cc rename to utilities/merge_operators/cassandra/cassandra_format_test.cc diff --git a/utilities/merge_operators/cassandra/row_merge_test.cc b/utilities/merge_operators/cassandra/cassandra_row_merge_test.cc similarity index 100% rename from utilities/merge_operators/cassandra/row_merge_test.cc rename to utilities/merge_operators/cassandra/cassandra_row_merge_test.cc diff --git a/utilities/merge_operators/cassandra/serialize_test.cc b/utilities/merge_operators/cassandra/cassandra_serialize_test.cc similarity index 100% rename from utilities/merge_operators/cassandra/serialize_test.cc rename to utilities/merge_operators/cassandra/cassandra_serialize_test.cc