diff options
| author | pkasting <pkasting@google.com> | 2015-08-19 16:40:51 -0700 |
|---|---|---|
| committer | Chris Mumford <cmumford@chromium.org> | 2015-12-09 10:34:58 -0800 |
| commit | 50e77a8263b19033b99ba49cdc45995595f1acf9 (patch) | |
| tree | b2c1120ce4c1fc3f9ecc2f3733aaa6f2a4ec8159 /table | |
| parent | 5208e7952d691e256a4ffe29888154068e8745b8 (diff) | |
| download | leveldb-50e77a8263b19033b99ba49cdc45995595f1acf9.tar.gz | |
Fix size_t/int comparison/conversion issues in leveldb.
The create function took |num_keys| as an int, but callers and implementers wanted it to function as a size_t (e.g. passing std::vector::size() in, passing it to vector constructors as a size arg, indexing containers by it, etc.). This resulted in implicit conversions between the two types as well as warnings (found with Chromium's external copy of these sources, built with MSVC) about signed vs. unsigned comparisons.
The leveldb sources were already widely using size_t elsewhere, e.g. for key and filter lengths, so using size_t here is not inconsistent with the existing code. However, it does change the public C API.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=101074871
Diffstat (limited to 'table')
| -rw-r--r-- | table/filter_block.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/table/filter_block.cc b/table/filter_block.cc index 203e15c..4e78b95 100644 --- a/table/filter_block.cc +++ b/table/filter_block.cc @@ -68,7 +68,7 @@ void FilterBlockBuilder::GenerateFilter() { // Generate filter for current set of keys and append to result_. filter_offsets_.push_back(result_.size()); - policy_->CreateFilter(&tmp_keys_[0], num_keys, &result_); + policy_->CreateFilter(&tmp_keys_[0], static_cast<int>(num_keys), &result_); tmp_keys_.clear(); keys_.clear(); @@ -97,7 +97,7 @@ bool FilterBlockReader::KeyMayMatch(uint64_t block_offset, const Slice& key) { if (index < num_) { uint32_t start = DecodeFixed32(offset_ + index*4); uint32_t limit = DecodeFixed32(offset_ + index*4 + 4); - if (start <= limit && limit <= (offset_ - data_)) { + if (start <= limit && limit <= static_cast<size_t>(offset_ - data_)) { Slice filter = Slice(data_ + start, limit - start); return policy_->KeyMayMatch(key, filter); } else if (start == limit) { |