mirror/leveldb
1
0
Fork 0
mirror of https://github.com/google/leveldb.git synced 2025-06-11 12:43:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deleted unused assignments in Reader.

Browse Source 
Deleted two unused assignments:

1. offset_in_block in Reader::SkipToInitialBlock().
2. in_fragmented_record in Reader::ReadRecord().

Reasons for the change:
1. offset_in_block is not read again after the if condition.
2. The kFullRecordType switch branch returns, so
   in_fragmented_record isn't read again.
3. The kFirstType switch branch sets in_fragmented_record to
   true after the if, so the write in the if is ignored.

Change contributed by @C0deAi on GitHub.

This fixes https://github.com/google/leveldb/issues/517

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172763897
This commit is contained in:
cmumford 2017-10-19 10:33:42 -07:00 committed by Victor Costan
parent 0509414f85
commit 3da4d8b989
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/log_reader.cc
View File

@ -34,12 +34,11 @@ Reader::~Reader() {
} }
bool Reader::SkipToInitialBlock() { bool Reader::SkipToInitialBlock() {
size_t offset_in_block = initial_offset_ % kBlockSize; const size_t offset_in_block = initial_offset_ % kBlockSize;
uint64_t block_start_location = initial_offset_ - offset_in_block; uint64_t block_start_location = initial_offset_ - offset_in_block;
// Don't search a block if we'd be in the trailer // Don't search a block if we'd be in the trailer
if (offset_in_block > kBlockSize - 6) { if (offset_in_block > kBlockSize - 6) {
offset_in_block = 0;
block_start_location += kBlockSize; block_start_location += kBlockSize;
} }
@ -99,9 +98,7 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch) {
// it could emit an empty kFirstType record at the tail end // it could emit an empty kFirstType record at the tail end
// of a block followed by a kFullType or kFirstType record // of a block followed by a kFullType or kFirstType record
// at the beginning of the next block. // at the beginning of the next block.
if (scratch->empty()) { if (!scratch->empty()) {
in_fragmented_record = false;
} else {
ReportCorruption(scratch->size(), "partial record without end(1)"); ReportCorruption(scratch->size(), "partial record without end(1)");
} }
} }
@ -117,9 +114,7 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch) {
// it could emit an empty kFirstType record at the tail end // it could emit an empty kFirstType record at the tail end
// of a block followed by a kFullType or kFirstType record // of a block followed by a kFullType or kFirstType record
// at the beginning of the next block. // at the beginning of the next block.
if (scratch->empty()) { if (!scratch->empty()) {
in_fragmented_record = false;
} else {
ReportCorruption(scratch->size(), "partial record without end(2)"); ReportCorruption(scratch->size(), "partial record without end(2)");
} }
} }