Skip to content

Commit

Permalink
fix bug(uninitialized options pointer in State)
Browse files Browse the repository at this point in the history
  • Loading branch information
neal-zhu committed Jun 11, 2019
1 parent f668239 commit 76ca116
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions db/version_set.cc
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ Status Version::Get(const ReadOptions& options, const LookupKey& k,
Slice ikey = k.internal_key();
Slice user_key = k.user_key();
const Comparator* ucmp = vset_->icmp_.user_comparator();

stats->seek_file = nullptr;
stats->seek_file_level = -1;

Expand All @@ -339,22 +338,23 @@ Status Version::Get(const ReadOptions& options, const LookupKey& k,
const Comparator* ucmp;
std::string* value;
FileMetaData* last_file_read;
int last_file_level;
int last_file_read_level;

VersionSet* vset;
Status s;

static bool Match(void* arg, int level, FileMetaData* f) {
State* state = reinterpret_cast<State*>(arg);

if (state->last_file_read != nullptr &&
state->stats->seek_file == nullptr) {
if (state->stats->seek_file == nullptr &&
state->last_file_read != nullptr) {
// We have had more than one seek for this read. Charge the 1st file.
state->stats->seek_file = state->last_file_read;
state->stats->seek_file_level = state->last_file_level;
state->stats->seek_file_level = state->last_file_read_level;
}

state->last_file_read = f;
state->last_file_level = level;
state->last_file_read_level = level;

Saver saver;
saver.state = kNotFound;
Expand Down Expand Up @@ -388,8 +388,9 @@ Status Version::Get(const ReadOptions& options, const LookupKey& k,
state.s = Status::NotFound(Slice());
state.stats = stats;
state.last_file_read = nullptr;
state.last_file_level = -1;
state.last_file_read_level = -1;

state.options = &options;
state.ikey = ikey;
state.user_key = user_key;
state.ucmp = ucmp;
Expand Down

0 comments on commit 76ca116

Please sign in to comment.