diff options
| author | Chris Mumford <cmumford@google.com> | 2019-10-28 10:19:33 -0700 |
|---|---|---|
| committer | Chris Mumford <cmumford@chromium.org> | 2019-10-28 13:24:08 -0700 |
| commit | 95d0ba1cb046bfd76619b8b80e14ee1b2897d219 (patch) | |
| tree | 35905829017e57d6a8b37eaae4ab29baf59f1816 /db | |
| parent | 657ba514298a726c7533f3106d3778062b59d75f (diff) | |
| download | leveldb-95d0ba1cb046bfd76619b8b80e14ee1b2897d219.tar.gz | |
Renamed local variable in DBImpl::Write.
The local variable `updates` in DBImpl::Write was hiding the
`updates` parameter. Renamed to avoid this conflict.
PiperOrigin-RevId: 277089971
Diffstat (limited to 'db')
| -rw-r--r-- | db/db_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/db/db_impl.cc b/db/db_impl.cc index 4754ba3..95e2bb4 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -1213,9 +1213,9 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* updates) { uint64_t last_sequence = versions_->LastSequence(); Writer* last_writer = &w; if (status.ok() && updates != nullptr) { // nullptr batch is for compactions - WriteBatch* updates = BuildBatchGroup(&last_writer); - WriteBatchInternal::SetSequence(updates, last_sequence + 1); - last_sequence += WriteBatchInternal::Count(updates); + WriteBatch* write_batch = BuildBatchGroup(&last_writer); + WriteBatchInternal::SetSequence(write_batch, last_sequence + 1); + last_sequence += WriteBatchInternal::Count(write_batch); // Add to log and apply to memtable. We can release the lock // during this phase since &w is currently responsible for logging @@ -1223,7 +1223,7 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* updates) { // into mem_. { mutex_.Unlock(); - status = log_->AddRecord(WriteBatchInternal::Contents(updates)); + status = log_->AddRecord(WriteBatchInternal::Contents(write_batch)); bool sync_error = false; if (status.ok() && options.sync) { status = logfile_->Sync(); @@ -1232,7 +1232,7 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* updates) { } } if (status.ok()) { - status = WriteBatchInternal::InsertInto(updates, mem_); + status = WriteBatchInternal::InsertInto(write_batch, mem_); } mutex_.Lock(); if (sync_error) { @@ -1242,7 +1242,7 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* updates) { RecordBackgroundError(status); } } - if (updates == tmp_batch_) tmp_batch_->Clear(); + if (write_batch == tmp_batch_) tmp_batch_->Clear(); versions_->SetLastSequence(last_sequence); } |