github-repos/leveldb
1
0
Fork 0
mirror of https://github.com/google/leveldb.git synced 2025-02-04 07:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Table::Open() flow and remove a delete call.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167303843
This commit is contained in:
costan 2017-09-01 11:44:05 -07:00 committed by Victor Costan
parent 09a3c8e741
commit 141e767135
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
table/table.cc
View File

@ -55,22 +55,19 @@ Status Table::Open(const Options& options,
if (!s.ok()) return s; if (!s.ok()) return s;
// Read the index block // Read the index block
BlockContents contents; BlockContents index_block_contents;
Block* index_block = NULL;
if (s.ok()) { if (s.ok()) {
ReadOptions opt; ReadOptions opt;
if (options.paranoid_checks) { if (options.paranoid_checks) {
opt.verify_checksums = true; opt.verify_checksums = true;
} }
s = ReadBlock(file, opt, footer.index_handle(), &contents); s = ReadBlock(file, opt, footer.index_handle(), &index_block_contents);
if (s.ok()) {
index_block = new Block(contents);
}
} }
if (s.ok()) { if (s.ok()) {
// We've successfully read the footer and the index block: we're // We've successfully read the footer and the index block: we're
// ready to serve requests. // ready to serve requests.
Block* index_block = new Block(index_block_contents);
Rep* rep = new Table::Rep; Rep* rep = new Table::Rep;
rep->options = options; rep->options = options;
rep->file = file; rep->file = file;
@ -81,8 +78,6 @@ Status Table::Open(const Options& options,
rep->filter = NULL; rep->filter = NULL;
*table = new Table(rep); *table = new Table(rep);
(*table)->ReadMeta(footer); (*table)->ReadMeta(footer);
} else {
delete index_block;
} }
return s; return s;