diff options
| author | Yi Wu <yiwu@fb.com> | 2016-05-09 11:52:28 -0700 |
|---|---|---|
| committer | Yi Wu <yiwu@fb.com> | 2016-05-09 13:43:05 -0700 |
| commit | 0645e8b42cbf34ce5ac4e583c80c668e5ca56756 (patch) | |
| tree | d54600ed37dfe7f52d56358d4e40e0c695748f3d | |
| parent | 6504c31cb610fa7837a6368f86109028aaa94e64 (diff) | |
Fix win buildv4.8rocksdb-4.8
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
| -rw-r--r-- | db/db_iterator_test.cc | 4 | ||||
| -rw-r--r-- | db/db_test_util.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/db/db_iterator_test.cc b/db/db_iterator_test.cc index bb771554f..bc40a1790 100644 --- a/db/db_iterator_test.cc +++ b/db/db_iterator_test.cc @@ -1566,7 +1566,7 @@ TEST_F(DBIteratorTest, ReadAhead) { auto* iter = db_->NewIterator(read_options); iter->SeekToFirst(); 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; env_->random_read_bytes_counter_ = 0; @@ -1575,7 +1575,7 @@ TEST_F(DBIteratorTest, ReadAhead) { iter = db_->NewIterator(read_options); iter->SeekToFirst(); 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; ASSERT_EQ(num_file_opens + 3, num_file_opens_readahead); ASSERT_GT(bytes_read_readahead, bytes_read); diff --git a/db/db_test_util.h b/db/db_test_util.h index 4f2cea29c..8aba1e5d7 100644 --- a/db/db_test_util.h +++ b/db/db_test_util.h @@ -359,7 +359,7 @@ class SpecialEnv : public EnvWrapper { public: CountingFile(unique_ptr<RandomAccessFile>&& target, anon::AtomicCounter* counter, - std::atomic<int64_t>* bytes_read) + std::atomic<size_t>* bytes_read) : target_(std::move(target)), counter_(counter), bytes_read_(bytes_read) {} @@ -374,7 +374,7 @@ class SpecialEnv : public EnvWrapper { private: unique_ptr<RandomAccessFile> target_; anon::AtomicCounter* counter_; - std::atomic<int64_t>* bytes_read_; + std::atomic<size_t>* bytes_read_; }; Status s = target()->NewRandomAccessFile(f, r, soptions); @@ -471,7 +471,7 @@ class SpecialEnv : public EnvWrapper { bool count_random_reads_; 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_; bool count_sequential_reads_; |