From c06d1d83932be91e344893a23b1ffb6cbd7bbf61 Mon Sep 17 00:00:00 2001 From: Islam AbdelRahman Date: Mon, 20 Jul 2015 11:17:52 -0700 Subject: [PATCH] Make merge_test runnable in ROCKSDB_LITE Summary: Make merge_test runnable in ROCKSDB_LITE Test Plan: merge_test Reviewers: igor, sdong, yhchiang, kradhakrishnan, anthony Reviewed By: anthony Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D42579 --- db/merge_test.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/db/merge_test.cc b/db/merge_test.cc index 7502b6718..192ea2fec 100644 --- a/db/merge_test.cc +++ b/db/merge_test.cc @@ -87,6 +87,8 @@ std::shared_ptr OpenDb(const string& dbname, const bool ttl = false, options.min_partial_merge_operands = min_partial_merge_operands; Status s; DestroyDB(dbname, Options()); +// DBWithTTL is not supported in ROCKSDB_LITE +#ifndef ROCKSDB_LITE if (ttl) { cout << "Opening database with TTL\n"; DBWithTTL* db_with_ttl; @@ -95,6 +97,10 @@ std::shared_ptr OpenDb(const string& dbname, const bool ttl = false, } else { s = DB::Open(options, dbname, &db); } +#else + assert(!ttl); + s = DB::Open(options, dbname, &db); +#endif // !ROCKSDB_LITE if (!s.ok()) { cerr << s.ToString() << endl; assert(false); @@ -503,7 +509,10 @@ int main(int argc, char *argv[]) { //TODO: Make this test like a general rocksdb unit-test rocksdb::port::InstallStackTraceHandler(); runTest(argc, test::TmpDir() + "/merge_testdb"); +// DBWithTTL is not supported in ROCKSDB_LITE +#ifndef ROCKSDB_LITE runTest(argc, test::TmpDir() + "/merge_testdbttl", true); // Run test on TTL database +#endif // !ROCKSDB_LITE printf("Passed all tests!\n"); return 0; }