diff --git a/db/transaction_log_impl.cc b/db/transaction_log_impl.cc index 8c526af12..55f87ede9 100644 --- a/db/transaction_log_impl.cc +++ b/db/transaction_log_impl.cc @@ -78,19 +78,16 @@ Status TransactionLogIteratorImpl::status() { return current_status_; } bool TransactionLogIteratorImpl::Valid() { return started_ && is_valid_; } -bool TransactionLogIteratorImpl::RestrictedRead( - Slice* record, - std::string* scratch) { +bool TransactionLogIteratorImpl::RestrictedRead(Slice* record) { // Don't read if no more complete entries to read from logs if (current_last_seq_ >= versions_->LastSequence()) { return false; } - return current_log_reader_->ReadRecord(record, scratch); + return current_log_reader_->ReadRecord(record, &scratch_); } void TransactionLogIteratorImpl::SeekToStartSequence(uint64_t start_file_index, bool strict) { - std::string scratch; Slice record; started_ = false; is_valid_ = false; @@ -104,7 +101,7 @@ void TransactionLogIteratorImpl::SeekToStartSequence(uint64_t start_file_index, reporter_.Info(current_status_.ToString().c_str()); return; } - while (RestrictedRead(&record, &scratch)) { + while (RestrictedRead(&record)) { if (record.size() < WriteBatchInternal::kHeader) { reporter_.Corruption( record.size(), Status::Corruption("very small log record")); @@ -155,7 +152,6 @@ void TransactionLogIteratorImpl::Next() { } void TransactionLogIteratorImpl::NextImpl(bool internal) { - std::string scratch; Slice record; is_valid_ = false; if (!internal && !started_) { @@ -167,7 +163,7 @@ void TransactionLogIteratorImpl::NextImpl(bool internal) { if (current_log_reader_->IsEOF()) { current_log_reader_->UnmarkEOF(); } - while (RestrictedRead(&record, &scratch)) { + while (RestrictedRead(&record)) { if (record.size() < WriteBatchInternal::kHeader) { reporter_.Corruption( record.size(), Status::Corruption("very small log record")); diff --git a/db/transaction_log_impl.h b/db/transaction_log_impl.h index 68ba62071..7d6993d1d 100644 --- a/db/transaction_log_impl.h +++ b/db/transaction_log_impl.h @@ -86,6 +86,7 @@ class TransactionLogIteratorImpl : public TransactionLogIterator { size_t current_file_index_; std::unique_ptr current_batch_; std::unique_ptr current_log_reader_; + std::string scratch_; Status OpenLogFile(const LogFile* log_file, std::unique_ptr* file); @@ -107,7 +108,7 @@ class TransactionLogIteratorImpl : public TransactionLogIterator { VersionSet const* const versions_; const bool seq_per_batch_; // Reads from transaction log only if the writebatch record has been written - bool RestrictedRead(Slice* record, std::string* scratch); + bool RestrictedRead(Slice* record); // Seeks to startingSequenceNumber reading from startFileIndex in files_. // If strict is set,then must get a batch starting with startingSequenceNumber void SeekToStartSequence(uint64_t start_file_index = 0, bool strict = false);