Skip to content

Commit aaece2a

Browse files
pdillingerfacebook-github-bot
authored andcommitted
Fix some defects reported by Coverity Scan (facebook#6933)
Summary: Confusing checks for null that are never null Pull Request resolved: facebook#6933 Test Plan: make check Reviewed By: cheng-chang Differential Revision: D21885466 Pulled By: pdillinger fbshipit-source-id: 4b48e03c2a33727f2702b0d12292f9fda5a3c475
1 parent c7432cc commit aaece2a

File tree

4 files changed

+15
-20
lines changed

4 files changed

+15
-20
lines changed

db/memtable_list.cc

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,20 @@ void MemTableListVersion::UnrefMemTable(autovector<MemTable*>* to_delete,
4343
}
4444

4545
MemTableListVersion::MemTableListVersion(
46-
size_t* parent_memtable_list_memory_usage, MemTableListVersion* old)
46+
size_t* parent_memtable_list_memory_usage, const MemTableListVersion& old)
4747
: max_write_buffer_number_to_maintain_(
48-
old->max_write_buffer_number_to_maintain_),
48+
old.max_write_buffer_number_to_maintain_),
4949
max_write_buffer_size_to_maintain_(
50-
old->max_write_buffer_size_to_maintain_),
50+
old.max_write_buffer_size_to_maintain_),
5151
parent_memtable_list_memory_usage_(parent_memtable_list_memory_usage) {
52-
if (old != nullptr) {
53-
memlist_ = old->memlist_;
54-
for (auto& m : memlist_) {
55-
m->Ref();
56-
}
52+
memlist_ = old.memlist_;
53+
for (auto& m : memlist_) {
54+
m->Ref();
55+
}
5756

58-
memlist_history_ = old->memlist_history_;
59-
for (auto& m : memlist_history_) {
60-
m->Ref();
61-
}
57+
memlist_history_ = old.memlist_history_;
58+
for (auto& m : memlist_history_) {
59+
m->Ref();
6260
}
6361
}
6462

@@ -604,7 +602,7 @@ void MemTableList::InstallNewVersion() {
604602
} else {
605603
// somebody else holds the current version, we need to create new one
606604
MemTableListVersion* version = current_;
607-
current_ = new MemTableListVersion(&current_memory_usage_, current_);
605+
current_ = new MemTableListVersion(&current_memory_usage_, *version);
608606
current_->Ref();
609607
version->Unref();
610608
}

db/memtable_list.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct FlushJobInfo;
4444
class MemTableListVersion {
4545
public:
4646
explicit MemTableListVersion(size_t* parent_memtable_list_memory_usage,
47-
MemTableListVersion* old = nullptr);
47+
const MemTableListVersion& old);
4848
explicit MemTableListVersion(size_t* parent_memtable_list_memory_usage,
4949
int max_write_buffer_number_to_maintain,
5050
int64_t max_write_buffer_size_to_maintain);

utilities/transactions/transaction_base.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,7 @@ std::vector<Status> TransactionBaseImpl::MultiGet(
312312

313313
std::vector<Status> stat_list(num_keys);
314314
for (size_t i = 0; i < num_keys; ++i) {
315-
std::string* value = values ? &(*values)[i] : nullptr;
316-
stat_list[i] = Get(read_options, column_family[i], keys[i], value);
315+
stat_list[i] = Get(read_options, column_family[i], keys[i], &(*values)[i]);
317316
}
318317

319318
return stat_list;
@@ -350,8 +349,7 @@ std::vector<Status> TransactionBaseImpl::MultiGetForUpdate(
350349
// TODO(agiardullo): optimize multiget?
351350
std::vector<Status> stat_list(num_keys);
352351
for (size_t i = 0; i < num_keys; ++i) {
353-
std::string* value = values ? &(*values)[i] : nullptr;
354-
stat_list[i] = Get(read_options, column_family[i], keys[i], value);
352+
stat_list[i] = Get(read_options, column_family[i], keys[i], &(*values)[i]);
355353
}
356354

357355
return stat_list;

utilities/transactions/write_prepared_txn_db.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@ std::vector<Status> WritePreparedTxnDB::MultiGet(
294294

295295
std::vector<Status> stat_list(num_keys);
296296
for (size_t i = 0; i < num_keys; ++i) {
297-
std::string* value = values ? &(*values)[i] : nullptr;
298-
stat_list[i] = this->Get(options, column_family[i], keys[i], value);
297+
stat_list[i] = this->Get(options, column_family[i], keys[i], &(*values)[i]);
299298
}
300299
return stat_list;
301300
}

0 commit comments

Comments
 (0)