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

Fix valgrind (DBIteratorTest.ReadAhead)

Browse Source 
Summary: This test is failing under valgrind because we dont delete the Env that we allocated

Test Plan: run the test under valgrind

Reviewers: andrewkr, yhchiang, yiwu, sdong

Reviewed By: sdong

Subscribers: andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D57693
This commit is contained in:
Islam AbdelRahman 2016-05-05 11:24:08 -07:00 committed by Yi Wu
parent 53a86bf61e
commit 6504c31cb6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
db/db_iterator_test.cc
View File

@ -1528,9 +1528,8 @@ TEST_F(DBIteratorTest, IteratorWithLocalStatistics) {
TEST_F(DBIteratorTest, ReadAhead) { TEST_F(DBIteratorTest, ReadAhead) {
Options options; Options options;
auto env = new SpecialEnv(Env::Default()); env_->count_random_reads_ = true;
env->count_random_reads_ = true; options.env = env_;
options.env = env;
options.disable_auto_compactions = true; options.disable_auto_compactions = true;
options.write_buffer_size = 4 << 20; options.write_buffer_size = 4 << 20;
options.statistics = rocksdb::CreateDBStatistics(); options.statistics = rocksdb::CreateDBStatistics();
@ -1561,22 +1560,22 @@ TEST_F(DBIteratorTest, ReadAhead) {
ASSERT_EQ("1,1,1", FilesPerLevel()); ASSERT_EQ("1,1,1", FilesPerLevel());
#endif // !ROCKSDB_LITE #endif // !ROCKSDB_LITE
env->random_read_bytes_counter_ = 0; env_->random_read_bytes_counter_ = 0;
options.statistics->setTickerCount(NO_FILE_OPENS, 0); options.statistics->setTickerCount(NO_FILE_OPENS, 0);
ReadOptions read_options; ReadOptions read_options;
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_; int64_t bytes_read = env_->random_read_bytes_counter_;
delete iter; delete iter;
env->random_read_bytes_counter_ = 0; env_->random_read_bytes_counter_ = 0;
options.statistics->setTickerCount(NO_FILE_OPENS, 0); options.statistics->setTickerCount(NO_FILE_OPENS, 0);
read_options.readahead_size = 1024 * 10; read_options.readahead_size = 1024 * 10;
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_; int64_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);