andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build error on Windows (AppVeyor) (#1315)

Browse Source 
Add 'cf_options' to source list and db_imple.cc

fix casting
This commit is contained in:
Injun Song 2016-09-07 00:41:43 +09:00 committed by yiwu-arbug
parent f7669b40ba
commit ce1be2ce37
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -193,6 +193,7 @@ set(SOURCES
util/arena.cc util/arena.cc
util/bloom.cc util/bloom.cc
util/build_version.cc util/build_version.cc
util/cf_options.cc
util/clock_cache.cc util/clock_cache.cc
util/coding.cc util/coding.cc
util/compaction_job_stats_impl.cc util/compaction_job_stats_impl.cc
@ -221,7 +222,6 @@ set(SOURCES
util/log_buffer.cc util/log_buffer.cc
util/memenv.cc util/memenv.cc
util/murmurhash.cc util/murmurhash.cc
util/mutable_cf_options.cc
util/options.cc util/options.cc
util/options_helper.cc util/options_helper.cc
util/options_parser.cc util/options_parser.cc

1
db/db_impl.cc
View File

@ -79,6 +79,7 @@
#include "table/two_level_iterator.h" #include "table/two_level_iterator.h"
#include "util/autovector.h" #include "util/autovector.h"
#include "util/build_version.h" #include "util/build_version.h"
#include "util/cf_options.h"
#include "util/coding.h" #include "util/coding.h"
#include "util/compression.h" #include "util/compression.h"
#include "util/crc32c.h" #include "util/crc32c.h"

6
table/block_test.cc
View File

@ -232,7 +232,7 @@ class BlockReadAmpBitmapSlowAndAccurate {
// Return true if any byte in this range was Marked // Return true if any byte in this range was Marked
bool IsAnyInRangeMarked(size_t start_offset, size_t end_offset) { bool IsAnyInRangeMarked(size_t start_offset, size_t end_offset) {
auto it = marked_ranges_.lower_bound(std::make_pair(start_offset, 0)); auto it = marked_ranges_.lower_bound(std::make_pair(start_offset, static_cast<size_t>(0)));
if (it == marked_ranges_.end()) { if (it == marked_ranges_.end()) {
return false; return false;
} }
@ -292,7 +292,7 @@ TEST_F(BlockTest, BlockReadAmpBitmap) {
random_entry_offsets.resize( random_entry_offsets.resize(
std::distance(random_entry_offsets.begin(), it)); std::distance(random_entry_offsets.begin(), it));
std::vector<std::pair<uint32_t, uint32_t>> random_entries; std::vector<std::pair<size_t, size_t>> random_entries;
for (size_t i = 0; i < random_entry_offsets.size(); i++) { for (size_t i = 0; i < random_entry_offsets.size(); i++) {
size_t entry_start = random_entry_offsets[i]; size_t entry_start = random_entry_offsets[i];
size_t entry_end; size_t entry_end;
@ -307,7 +307,7 @@ TEST_F(BlockTest, BlockReadAmpBitmap) {
for (size_t i = 0; i < random_entries.size(); i++) { for (size_t i = 0; i < random_entries.size(); i++) {
auto &current_entry = random_entries[rnd.Next() % random_entries.size()]; auto &current_entry = random_entries[rnd.Next() % random_entries.size()];
read_amp_bitmap.Mark(current_entry.first, current_entry.second); read_amp_bitmap.Mark(static_cast<uint32_t>(current_entry.first), static_cast<uint32_t>(current_entry.second));
read_amp_slow_and_accurate.Mark(current_entry.first, read_amp_slow_and_accurate.Mark(current_entry.first,
current_entry.second); current_entry.second);