rocksdb/db
Levi Tamasi fbd9077d66 Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925)
Summary:
The patch fixes a bug where `GetContext::Merge` (and `MergeEntity`) does not update the ticker `READ_NUM_MERGE_OPERANDS` because it implicitly uses the default parameter value of `update_num_ops_stats=false` when calling `MergeHelper::TimedFullMerge`. Also, to prevent such issues going forward, the PR removes the default parameter values from the `TimedFullMerge` methods. In addition, it removes an unused/unnecessary parameter from `TimedFullMergeWithEntity`, and does some cleanup at the call sites of these methods.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/10925

Test Plan: `make check`

Reviewed By: riversand963

Differential Revision: D41096453

Pulled By: ltamasi

fbshipit-source-id: fc60646d32b4d516b8fe81e265c3f020a32fd7f8
2022-11-07 15:42:10 -08:00
..
blob Run clang-format on db/blob/ (#10856) 2022-10-24 16:00:32 -07:00
compaction Basic Support for Merge with user-defined timestamp (#10819) 2022-10-31 22:28:58 -07:00
db_impl Basic Support for Merge with user-defined timestamp (#10819) 2022-10-31 22:28:58 -07:00
wide Support Merge for wide-column entities during point lookups (#10916) 2022-11-03 08:35:42 -07:00
arena_wrapped_db_iter.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
arena_wrapped_db_iter.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
builder.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
builder.h Add seqno to time mapping (#10338) 2022-07-14 21:49:34 -07:00
c.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
c_test.c Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
column_family.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
column_family.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
column_family_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
compact_files_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
comparator_db_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
convenience.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
corruption_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
cuckoo_table_db_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_basic_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_block_cache_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_bloom_filter_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_compaction_filter_test.cc Skip swaths of range tombstone covered keys in merging iterator (2022 edition) (#10449) 2022-09-02 09:51:19 -07:00
db_compaction_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_dynamic_level_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_encryption_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_filesnapshot.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_flush_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_info_dumper.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_info_dumper.h Add a DB Session ID (#6959) 2020-06-15 10:47:02 -07:00
db_inplace_update_test.cc Fix in-place updates for value types other than kTypeValue (#10254) 2022-06-27 16:37:09 -07:00
db_io_failure_test.cc Enable a few unit tests to use custom Env objects (#9087) 2021-11-08 11:05:59 -08:00
db_iter.cc Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925) 2022-11-07 15:42:10 -08:00
db_iter.h Basic Support for Merge with user-defined timestamp (#10819) 2022-10-31 22:28:58 -07:00
db_iter_stress_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_iter_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_iterator_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_kv_checksum_test.cc Print stack traces on frozen tests in CI (#10828) 2022-10-18 00:35:35 -07:00
db_log_iter_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_logical_block_size_cache_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_memtable_test.cc Add support for wide-column point lookups (#10540) 2022-08-19 11:51:12 -07:00
db_merge_operand_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_merge_operator_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_options_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_properties_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_range_del_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_rate_limiter_test.cc Add rate-limiting support to batched MultiGet() (#10159) 2022-06-17 16:40:47 -07:00
db_readonly_with_timestamp_test.cc Add timestamp support to CompactedDBImpl (#10030) 2022-05-24 12:14:10 -07:00
db_secondary_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_sst_test.cc Fix periodic_task unable to re-register the same task type (#10379) 2022-08-25 18:52:37 -07:00
db_statistics_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_table_properties_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_tailing_iter_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_test2.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_test_util.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_test_util.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_universal_compaction_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
db_wal_test.cc Deflake DBWALTest.RaceInstallFlushResultsWithWalObsoletion (#10456) 2022-08-04 12:14:28 -07:00
db_with_timestamp_basic_test.cc Fix a bug in range scan with merge and deletion with timestamp (#10915) 2022-11-03 13:02:06 -07:00
db_with_timestamp_compaction_test.cc Fix overlapping check by excluding timestamp (#10615) 2022-09-08 13:03:07 -07:00
db_with_timestamp_test_util.cc Add timestamp support to DBImplReadOnly (#10004) 2022-05-19 18:39:41 -07:00
db_with_timestamp_test_util.h Add timestamp support to DBImplReadOnly (#10004) 2022-05-19 18:39:41 -07:00
db_write_buffer_manager_test.cc Prevent a case of WriteBufferManager flush thrashing (#6364) 2022-08-17 15:53:40 -07:00
db_write_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
dbformat.cc User-defined timestamp support for DeleteRange() (#10661) 2022-09-30 16:13:03 -07:00
dbformat.h Basic Support for Merge with user-defined timestamp (#10819) 2022-10-31 22:28:58 -07:00
dbformat_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
deletefile_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
error_handler.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
error_handler.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
error_handler_fs_test.cc Deflake DBErrorHandlingFSTest.*WALWriteError (#10642) 2022-09-06 12:59:02 -07:00
event_helpers.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
event_helpers.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
experimental.cc Allow manifest fix-up without requiring prior state (#10796) 2022-10-10 17:59:17 -07:00
external_sst_file_basic_test.cc Refactor to avoid confusing "raw block" (#10408) 2022-09-22 11:25:32 -07:00
external_sst_file_ingestion_job.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
external_sst_file_ingestion_job.h Track SST unique id in MANIFEST and verify (#9990) 2022-05-19 11:04:21 -07:00
external_sst_file_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
fault_injection_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
file_indexer.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
file_indexer.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
file_indexer_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
filename_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
flush_job.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
flush_job.h Add seqno to time mapping (#10338) 2022-07-14 21:49:34 -07:00
flush_job_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
flush_scheduler.cc Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433) 2020-02-20 12:09:57 -08:00
flush_scheduler.h Include C++ standard library headers instead of C compatibility headers (#8068) 2021-03-19 12:09:47 -07:00
forward_iterator.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
forward_iterator.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
forward_iterator_bench.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
history_trimming_iterator.h Add OpenAndTrimHistory API to support trimming data with specified timestamp (#9410) 2022-03-11 16:13:23 -08:00
import_column_family_job.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
import_column_family_job.h Add some missing headers (#10519) 2022-08-11 12:45:50 -07:00
import_column_family_test.cc Add some missing headers (#10519) 2022-08-11 12:45:50 -07:00
internal_stats.cc Avoid repeat periodic stats printing when there is no change (#10891) 2022-10-31 09:51:38 -07:00
internal_stats.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
job_context.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
kv_checksum.h Add memtable per key-value checksum (#10281) 2022-08-12 13:51:32 -07:00
listener_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
log_format.h Add record to set WAL compression type if enabled (#9556) 2022-02-17 16:19:31 -08:00
log_reader.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
log_reader.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
log_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
log_writer.cc Add manual_wal_flush, FlushWAL() to stress/crash test (#10698) 2022-09-30 15:48:33 -07:00
log_writer.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
logs_with_prep_tracker.cc Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433) 2020-02-20 12:09:57 -08:00
logs_with_prep_tracker.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
lookup_key.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
malloc_stats.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
malloc_stats.h Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433) 2020-02-20 12:09:57 -08:00
manual_compaction_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
memtable.cc Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925) 2022-11-07 15:42:10 -08:00
memtable.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
memtable_list.cc Fix flush picking non-consecutive memtables (#10921) 2022-11-04 15:55:54 -07:00
memtable_list.h Fix memtable-only iterator regression (#10705) 2022-09-21 09:49:31 -07:00
memtable_list_test.cc Fix flush picking non-consecutive memtables (#10921) 2022-11-04 15:55:54 -07:00
merge_context.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
merge_helper.cc Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925) 2022-11-07 15:42:10 -08:00
merge_helper.h Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925) 2022-11-07 15:42:10 -08:00
merge_helper_test.cc Basic Support for Merge with user-defined timestamp (#10819) 2022-10-31 22:28:58 -07:00
merge_operator.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
merge_test.cc Make the Env class Customizable (#9293) 2022-01-04 16:45:49 -08:00
obsolete_files_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
options_file_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
output_validator.cc Cleanup includes in dbformat.h (#8930) 2021-09-29 04:04:40 -07:00
output_validator.h Cleanup includes in dbformat.h (#8930) 2021-09-29 04:04:40 -07:00
perf_context_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
periodic_task_scheduler.cc Fix periodic_task unable to re-register the same task type (#10379) 2022-08-25 18:52:37 -07:00
periodic_task_scheduler.h Fix periodic_task unable to re-register the same task type (#10379) 2022-08-25 18:52:37 -07:00
periodic_task_scheduler_test.cc Print stack traces on frozen tests in CI (#10828) 2022-10-18 00:35:35 -07:00
pinned_iterators_manager.h Avoid allocations/copies for large GetMergeOperands() results (#10458) 2022-08-04 00:42:13 -07:00
plain_table_db_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
post_memtable_callback.h Snapshots with user-specified timestamps (#9879) 2022-06-10 16:07:03 -07:00
pre_release_callback.h Fix and detect headers with missing dependencies (#8893) 2021-09-10 10:00:26 -07:00
prefix_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
range_del_aggregator.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
range_del_aggregator.h User-defined timestamp support for DeleteRange() (#10661) 2022-09-30 16:13:03 -07:00
range_del_aggregator_bench.cc Improve FragmentTombstones() speed by lazily initializing seq_set_ (#10848) 2022-10-25 11:33:04 -07:00
range_del_aggregator_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
range_tombstone_fragmenter.cc Improve FragmentTombstones() speed by lazily initializing seq_set_ (#10848) 2022-10-25 11:33:04 -07:00
range_tombstone_fragmenter.h Improve FragmentTombstones() speed by lazily initializing seq_set_ (#10848) 2022-10-25 11:33:04 -07:00
range_tombstone_fragmenter_test.cc Print stack traces on frozen tests in CI (#10828) 2022-10-18 00:35:35 -07:00
read_callback.h Fix and detect headers with missing dependencies (#8893) 2021-09-10 10:00:26 -07:00
repair.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
repair_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
seqno_time_test.cc Add option preserve_internal_time_seconds to preserve the time info (#10747) 2022-10-07 18:49:40 -07:00
seqno_to_time_mapping.cc Add option preserve_internal_time_seconds to preserve the time info (#10747) 2022-10-07 18:49:40 -07:00
seqno_to_time_mapping.h Add option preserve_internal_time_seconds to preserve the time info (#10747) 2022-10-07 18:49:40 -07:00
snapshot_checker.h Use STATIC_AVOID_DESTRUCTION for static objects with non-trivial destructors (#9958) 2022-05-17 09:39:22 -07:00
snapshot_impl.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
snapshot_impl.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
table_cache.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
table_cache.h Always verify SST unique IDs on SST file open (#10532) 2022-09-07 22:52:42 -07:00
table_cache_sync_and_async.h Always verify SST unique IDs on SST file open (#10532) 2022-09-07 22:52:42 -07:00
table_properties_collector.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
table_properties_collector.h Refactor to avoid confusing "raw block" (#10408) 2022-09-22 11:25:32 -07:00
table_properties_collector_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
transaction_log_impl.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
transaction_log_impl.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
trim_history_scheduler.cc Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433) 2020-02-20 12:09:57 -08:00
trim_history_scheduler.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
version_builder.cc Always verify SST unique IDs on SST file open (#10532) 2022-09-07 22:52:42 -07:00
version_builder.h Account memory of FileMetaData in global memory limit (#9924) 2022-06-14 13:06:40 -07:00
version_builder_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
version_edit.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
version_edit.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
version_edit_handler.cc Add blob source to retrieve blobs in RocksDB (#10198) 2022-06-20 20:58:11 -07:00
version_edit_handler.h Fixed manifest_dump issues when printing keys and values containing null characters (#8378) 2021-06-10 12:55:20 -07:00
version_edit_test.cc Print stack traces on frozen tests in CI (#10828) 2022-10-18 00:35:35 -07:00
version_set.cc Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925) 2022-11-07 15:42:10 -08:00
version_set.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
version_set_sync_and_async.h Support Merge for wide-column entities during point lookups (#10916) 2022-11-03 08:35:42 -07:00
version_set_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
version_util.h Allow manifest fix-up without requiring prior state (#10796) 2022-10-10 17:59:17 -07:00
wal_edit.cc Do not hold mutex when write keys if not necessary (#7516) 2022-07-21 13:35:36 -07:00
wal_edit.h Do not hold mutex when write keys if not necessary (#7516) 2022-07-21 13:35:36 -07:00
wal_edit_test.cc Do not hold mutex when write keys if not necessary (#7516) 2022-07-21 13:35:36 -07:00
wal_manager.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
wal_manager.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
wal_manager_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_batch.cc Fix a bug where GetContext does not update READ_NUM_MERGE_OPERANDS (#10925) 2022-11-07 15:42:10 -08:00
write_batch_base.cc Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433) 2020-02-20 12:09:57 -08:00
write_batch_internal.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_batch_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_callback.h Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433) 2020-02-20 12:09:57 -08:00
write_callback_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_controller.cc Revamp WriteController (#8064) 2021-03-18 09:47:31 -07:00
write_controller.h Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_controller_test.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_thread.cc Ran clang-format on db/ directory (#10910) 2022-11-02 14:34:24 -07:00
write_thread.h Fix race in ExitAsBatchGroupLeader with pipelined writes (#9944) 2022-08-02 14:52:10 -07:00