From e290f5d3ce7ae5e711b95af5475f94f348a7e98e Mon Sep 17 00:00:00 2001 From: Islam AbdelRahman Date: Mon, 13 Jul 2015 18:45:55 -0700 Subject: [PATCH] Block reduce_levels_test in ROCKSDB_LITE Summary: Block reduce_levels_test in ROCKSDB_LITE as LDBCommand is not supported Test Plan: make reduce_levels_test -j64 OPT=-DROCKSDB_LITE make reduce_levels_test -j64 make check -j64 Reviewers: sdong, igor, yhchiang Reviewed By: yhchiang Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D41967 --- db/compaction_picker.cc | 5 ++++- tools/reduce_levels_test.cc | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/db/compaction_picker.cc b/db/compaction_picker.cc index 26dbb82d4..72ba5f7dd 100644 --- a/db/compaction_picker.cc +++ b/db/compaction_picker.cc @@ -38,6 +38,9 @@ uint64_t TotalCompensatedFileSize(const std::vector& files) { return sum; } +// Universal compaction is not supported in ROCKSDB_LITE +#ifndef ROCKSDB_LITE + // Used in universal compaction when trivial move is enabled. // This structure is used for the construction of min heap // that contains the file meta data, the level of the file @@ -95,7 +98,7 @@ SmallestKeyHeap create_level_heap(Compaction* c, const Comparator* ucmp) { } return smallest_key_priority_q; } - +#endif // !ROCKSDB_LITE } // anonymous namespace // Determine compression type, based on user options, level of the output diff --git a/tools/reduce_levels_test.cc b/tools/reduce_levels_test.cc index c21c6d713..4a92648f4 100644 --- a/tools/reduce_levels_test.cc +++ b/tools/reduce_levels_test.cc @@ -3,6 +3,9 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // + +#ifndef ROCKSDB_LITE + #include "rocksdb/db.h" #include "db/db_impl.h" #include "db/version_set.h" @@ -197,3 +200,13 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } + +#else +#include + +int main(int argc, char** argv) { + fprintf(stderr, "SKIPPED as LDBCommand is not supported in ROCKSDB_LITE\n"); + return 0; +} + +#endif // !ROCKSDB_LITE