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

Merge pull request #664 from yuslepukhin/add_tests_fix_sanity

Browse Source 
Add missing tests, fix db_sanity
This commit is contained in:
Siying Dong 2015-07-21 19:03:44 -07:00
commit f09d45690b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -273,6 +273,7 @@ set(TESTS
db/log_test.cc db/log_test.cc
db/memtable_list_test.cc db/memtable_list_test.cc
db/merge_test.cc db/merge_test.cc
db/merge_helper_test.cc
db/perf_context_test.cc db/perf_context_test.cc
db/plain_table_db_test.cc db/plain_table_db_test.cc
db/prefix_test.cc db/prefix_test.cc
@ -307,6 +308,7 @@ set(TESTS
util/event_logger_test.cc util/event_logger_test.cc
util/filelock_test.cc util/filelock_test.cc
util/file_reader_writer_test.cc util/file_reader_writer_test.cc
util/heap_test.cc
util/histogram_test.cc util/histogram_test.cc
util/manual_compaction_test.cc util/manual_compaction_test.cc
util/memenv_test.cc util/memenv_test.cc

4
tools/db_sanity_test.cc
View File

@ -38,7 +38,7 @@ class SanityTest {
options.create_if_missing = true; options.create_if_missing = true;
std::string dbname = path_ + Name(); std::string dbname = path_ + Name();
DestroyDB(dbname, options); DestroyDB(dbname, options);
DB* db; DB* db = nullptr;
Status s = DB::Open(options, dbname, &db); Status s = DB::Open(options, dbname, &db);
std::unique_ptr<DB> db_guard(db); std::unique_ptr<DB> db_guard(db);
if (!s.ok()) { if (!s.ok()) {
@ -55,7 +55,7 @@ class SanityTest {
return db->Flush(FlushOptions()); return db->Flush(FlushOptions());
} }
Status Verify() { Status Verify() {
DB* db; DB* db = nullptr;
std::string dbname = path_ + Name(); std::string dbname = path_ + Name();
Status s = DB::Open(GetOptions(), dbname, &db); Status s = DB::Open(GetOptions(), dbname, &db);
std::unique_ptr<DB> db_guard(db); std::unique_ptr<DB> db_guard(db);