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

minor - remove default value for ChangeFilterOptions() and ChangeCompactionOptions()

Browse Source 
Summary:
So now all open() in db_test should get options from callsite. And
destroy() always uses the last used options saved on open()
I will start to integrate env_mem in the next diff

Test Plan: make all check -j32

Reviewers: sdong, yhchiang, rven, igor

Reviewed By: igor

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D27819
This commit is contained in:
Lei Jin 2014-10-29 13:36:18 -07:00
parent 44f0ff31c2
commit 76d54530d3
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
db/db_test.cc
View File

@ -480,14 +480,10 @@ class DBTest {
} }
// Switch between different compaction styles (we have only 2 now). // Switch between different compaction styles (we have only 2 now).
bool ChangeCompactOptions(Options* prev_options = nullptr) { bool ChangeCompactOptions() {
if (option_config_ == kDefault) { if (option_config_ == kDefault) {
option_config_ = kUniversalCompaction; option_config_ = kUniversalCompaction;
if (prev_options == nullptr) { Destroy(last_options_);
prev_options = &last_options_;
}
Destroy(*prev_options);
auto options = CurrentOptions(); auto options = CurrentOptions();
options.create_if_missing = true; options.create_if_missing = true;
TryReopen(options); TryReopen(options);
@ -499,7 +495,7 @@ class DBTest {
// Switch between different filter policy // Switch between different filter policy
// Jump from kDefault to kFilter to kFullFilter // Jump from kDefault to kFilter to kFullFilter
bool ChangeFilterOptions(Options* prev_options = nullptr) { bool ChangeFilterOptions() {
if (option_config_ == kDefault) { if (option_config_ == kDefault) {
option_config_ = kFilter; option_config_ = kFilter;
} else if (option_config_ == kFilter) { } else if (option_config_ == kFilter) {
@ -507,10 +503,7 @@ class DBTest {
} else { } else {
return false; return false;
} }
if (prev_options == nullptr) { Destroy(last_options_);
prev_options = &last_options_;
}
Destroy(*prev_options);
auto options = CurrentOptions(); auto options = CurrentOptions();
options.create_if_missing = true; options.create_if_missing = true;
@ -5537,7 +5530,7 @@ TEST(DBTest, ComparatorCheck) {
ASSERT_TRUE(!s.ok()); ASSERT_TRUE(!s.ok());
ASSERT_TRUE(s.ToString().find("comparator") != std::string::npos) ASSERT_TRUE(s.ToString().find("comparator") != std::string::npos)
<< s.ToString(); << s.ToString();
} while (ChangeCompactOptions(&new_options)); } while (ChangeCompactOptions());
} }
TEST(DBTest, CustomComparator) { TEST(DBTest, CustomComparator) {
@ -5596,7 +5589,7 @@ TEST(DBTest, CustomComparator) {
} }
Compact(1, "[0]", "[1000000]"); Compact(1, "[0]", "[1000000]");
} }
} while (ChangeCompactOptions(&new_options)); } while (ChangeCompactOptions());
} }
TEST(DBTest, ManualCompaction) { TEST(DBTest, ManualCompaction) {