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

Fix win build

Browse Source 
Summary: Fixing error with win build where we compare int64_t with size_t.

Test Plan: make check

Reviewers: andrewkr

Reviewed By: andrewkr

Subscribers: andrewkr, dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D57885
This commit is contained in:
Yi Wu 2016-05-09 11:52:28 -07:00
parent a9b3c47c8e
commit 730f7e2e21
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/db_iterator_test.cc
View File

@ -1566,7 +1566,7 @@ TEST_F(DBIteratorTest, ReadAhead) {
auto* iter = db_->NewIterator(read_options); auto* iter = db_->NewIterator(read_options);
iter->SeekToFirst(); iter->SeekToFirst();
int64_t num_file_opens = TestGetTickerCount(options, NO_FILE_OPENS); int64_t num_file_opens = TestGetTickerCount(options, NO_FILE_OPENS);
int64_t bytes_read = env_->random_read_bytes_counter_; size_t bytes_read = env_->random_read_bytes_counter_;
delete iter; delete iter;
env_->random_read_bytes_counter_ = 0; env_->random_read_bytes_counter_ = 0;
@ -1575,7 +1575,7 @@ TEST_F(DBIteratorTest, ReadAhead) {
iter = db_->NewIterator(read_options); iter = db_->NewIterator(read_options);
iter->SeekToFirst(); iter->SeekToFirst();
int64_t num_file_opens_readahead = TestGetTickerCount(options, NO_FILE_OPENS); int64_t num_file_opens_readahead = TestGetTickerCount(options, NO_FILE_OPENS);
int64_t bytes_read_readahead = env_->random_read_bytes_counter_; size_t bytes_read_readahead = env_->random_read_bytes_counter_;
delete iter; delete iter;
ASSERT_EQ(num_file_opens + 3, num_file_opens_readahead); ASSERT_EQ(num_file_opens + 3, num_file_opens_readahead);
ASSERT_GT(bytes_read_readahead, bytes_read); ASSERT_GT(bytes_read_readahead, bytes_read);

6
db/db_test_util.h
View File

@ -359,7 +359,7 @@ class SpecialEnv : public EnvWrapper {
public: public:
CountingFile(unique_ptr<RandomAccessFile>&& target, CountingFile(unique_ptr<RandomAccessFile>&& target,
anon::AtomicCounter* counter, anon::AtomicCounter* counter,
std::atomic<int64_t>* bytes_read) std::atomic<size_t>* bytes_read)
: target_(std::move(target)), : target_(std::move(target)),
counter_(counter), counter_(counter),
bytes_read_(bytes_read) {} bytes_read_(bytes_read) {}
@ -374,7 +374,7 @@ class SpecialEnv : public EnvWrapper {
private: private:
unique_ptr<RandomAccessFile> target_; unique_ptr<RandomAccessFile> target_;
anon::AtomicCounter* counter_; anon::AtomicCounter* counter_;
std::atomic<int64_t>* bytes_read_; std::atomic<size_t>* bytes_read_;
}; };
Status s = target()->NewRandomAccessFile(f, r, soptions); Status s = target()->NewRandomAccessFile(f, r, soptions);
@ -471,7 +471,7 @@ class SpecialEnv : public EnvWrapper {
bool count_random_reads_; bool count_random_reads_;
anon::AtomicCounter random_read_counter_; anon::AtomicCounter random_read_counter_;
std::atomic<int64_t> random_read_bytes_counter_; std::atomic<size_t> random_read_bytes_counter_;
std::atomic<int> random_file_open_counter_; std::atomic<int> random_file_open_counter_;
bool count_sequential_reads_; bool count_sequential_reads_;