Skip to content

Commit 06d9862

Browse files
committed
Always pass MergeContext as pointer, not reference
Summary: To follow the coding convention and make sure when passing reference as a parameter it is also const, pass MergeContext as a pointer to mem tables. Test Plan: make all check Reviewers: ljin, igor Reviewed By: igor Subscribers: leveldb, dhruba, yhchiang Differential Revision: https://reviews.facebook.net/D23085
1 parent d343c3f commit 06d9862

6 files changed

+10
-10
lines changed

db/db_impl.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -3449,10 +3449,10 @@ Status DBImpl::GetImpl(const ReadOptions& options,
34493449
LookupKey lkey(key, snapshot);
34503450
PERF_TIMER_STOP(get_snapshot_time);
34513451

3452-
if (sv->mem->Get(lkey, value, &s, merge_context)) {
3452+
if (sv->mem->Get(lkey, value, &s, &merge_context)) {
34533453
// Done
34543454
RecordTick(stats_, MEMTABLE_HIT);
3455-
} else if (sv->imm->Get(lkey, value, &s, merge_context)) {
3455+
} else if (sv->imm->Get(lkey, value, &s, &merge_context)) {
34563456
// Done
34573457
RecordTick(stats_, MEMTABLE_HIT);
34583458
} else {
@@ -3537,9 +3537,9 @@ std::vector<Status> DBImpl::MultiGet(
35373537
assert(mgd_iter != multiget_cf_data.end());
35383538
auto mgd = mgd_iter->second;
35393539
auto super_version = mgd->super_version;
3540-
if (super_version->mem->Get(lkey, value, &s, merge_context)) {
3540+
if (super_version->mem->Get(lkey, value, &s, &merge_context)) {
35413541
// Done
3542-
} else if (super_version->imm->Get(lkey, value, &s, merge_context)) {
3542+
} else if (super_version->imm->Get(lkey, value, &s, &merge_context)) {
35433543
// Done
35443544
} else {
35453545
super_version->current->Get(options, lkey, value, &s, &merge_context);

db/db_impl_readonly.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Status DBImplReadOnly::Get(const ReadOptions& read_options,
6161
SuperVersion* super_version = cfd->GetSuperVersion();
6262
MergeContext merge_context;
6363
LookupKey lkey(key, snapshot);
64-
if (super_version->mem->Get(lkey, value, &s, merge_context)) {
64+
if (super_version->mem->Get(lkey, value, &s, &merge_context)) {
6565
} else {
6666
super_version->current->Get(read_options, lkey, value, &s, &merge_context);
6767
}

db/memtable.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ static bool SaveValue(void* arg, const char* entry) {
430430
}
431431

432432
bool MemTable::Get(const LookupKey& key, std::string* value, Status* s,
433-
MergeContext& merge_context) {
433+
MergeContext* merge_context) {
434434
// The sequence number is updated synchronously in version_set.h
435435
if (IsEmpty()) {
436436
// Avoiding recording stats for speed.
@@ -454,7 +454,7 @@ bool MemTable::Get(const LookupKey& key, std::string* value, Status* s,
454454
saver.value = value;
455455
saver.status = s;
456456
saver.mem = this;
457-
saver.merge_context = &merge_context;
457+
saver.merge_context = merge_context;
458458
saver.merge_operator = ioptions_.merge_operator;
459459
saver.logger = ioptions_.info_log;
460460
saver.inplace_update_support = moptions_.inplace_update_support;

db/memtable.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class MemTable {
118118
// store MergeInProgress in s, and return false.
119119
// Else, return false.
120120
bool Get(const LookupKey& key, std::string* value, Status* s,
121-
MergeContext& merge_context);
121+
MergeContext* merge_context);
122122

123123
// Attempts to update the new_value inplace, else does normal Add
124124
// Pseudocode

db/memtable_list.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int MemTableList::size() const {
6262
// Return the most recent value found, if any.
6363
// Operands stores the list of merge operations to apply, so far.
6464
bool MemTableListVersion::Get(const LookupKey& key, std::string* value,
65-
Status* s, MergeContext& merge_context) {
65+
Status* s, MergeContext* merge_context) {
6666
for (auto& memtable : memlist_) {
6767
if (memtable->Get(key, value, s, merge_context)) {
6868
return true;

db/memtable_list.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MemTableListVersion {
4646
// Search all the memtables starting from the most recent one.
4747
// Return the most recent value found, if any.
4848
bool Get(const LookupKey& key, std::string* value, Status* s,
49-
MergeContext& merge_context);
49+
MergeContext* merge_context);
5050

5151
void AddIterators(const ReadOptions& options,
5252
std::vector<Iterator*>* iterator_list, Arena* arena);

0 commit comments

Comments
 (0)