Browse Source

Remove confusing and unnecessary if.

12 lines above, there is an "if (!s.ok()) { return s; }" block of code.
"s" is never modified between that block and the "if" removed by this
CL, so "s.ok()" must be true.

The code most likely intended to say "if (!builder->ok())", because the
builder->Add() call above can modify the TableBuilder's status, as a
side-effect. However, this approach would have required setting "s =
builder.status()" in the "else" branch, near the "builder.Abandon()"
call. So, removing the "if" outright is simpler than following that line
of thought.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167326229
xry
costan 7 years ago
committed by Victor Costan
parent
commit
ea0a7586b8
1 changed files with 3 additions and 7 deletions
  1. +3
    -7
      db/builder.cc

+ 3
- 7
db/builder.cc View File

@ -41,14 +41,10 @@ Status BuildTable(const std::string& dbname,
}
// Finish and check for builder errors
s = builder->Finish();
if (s.ok()) {
s = builder->Finish();
if (s.ok()) {
meta->file_size = builder->FileSize();
assert(meta->file_size > 0);
}
} else {
builder->Abandon();
meta->file_size = builder->FileSize();
assert(meta->file_size > 0);
}
delete builder;

Loading…
Cancel
Save