From eade498bda4d9736b11e4626d5224262472c91be Mon Sep 17 00:00:00 2001 From: Yueh-Hsuan Chiang Date: Thu, 18 Jun 2015 15:54:05 -0700 Subject: [PATCH] Block utilities/write_batch_with_index in ROCKSDB_LITE Summary: Block utilities/write_batch_with_index in ROCKSDB_LITE as we don't include anly utilities in ROCKSDB_LITE Test Plan: write_batch_with_index_test Reviewers: rven, anthony, kradhakrishnan, IslamAbdelRahman, igor, sdong Reviewed By: sdong Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D40347 --- include/rocksdb/utilities/write_batch_with_index.h | 3 +++ .../write_batch_with_index/write_batch_with_index.cc | 3 +++ .../write_batch_with_index_internal.cc | 4 ++++ .../write_batch_with_index_internal.h | 3 +++ .../write_batch_with_index_test.cc | 11 +++++++++++ 5 files changed, 24 insertions(+) diff --git a/include/rocksdb/utilities/write_batch_with_index.h b/include/rocksdb/utilities/write_batch_with_index.h index 1da4421f3..22e7253c1 100644 --- a/include/rocksdb/utilities/write_batch_with_index.h +++ b/include/rocksdb/utilities/write_batch_with_index.h @@ -9,6 +9,7 @@ // A WriteBatchWithIndex with a binary searchable index built for all the keys // inserted. +#ifndef ROCKSDB_LITE #pragma once #include @@ -162,3 +163,5 @@ class WriteBatchWithIndex : public WriteBatchBase { }; } // namespace rocksdb + +#endif // !ROCKSDB_LITE diff --git a/utilities/write_batch_with_index/write_batch_with_index.cc b/utilities/write_batch_with_index/write_batch_with_index.cc index 5c8292e45..0da3df61e 100644 --- a/utilities/write_batch_with_index/write_batch_with_index.cc +++ b/utilities/write_batch_with_index/write_batch_with_index.cc @@ -3,6 +3,8 @@ // 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/utilities/write_batch_with_index.h" #include @@ -638,3 +640,4 @@ Status WriteBatchWithIndex::GetFromBatchAndDB(DB* db, } } // namespace rocksdb +#endif // !ROCKSDB_LITE diff --git a/utilities/write_batch_with_index/write_batch_with_index_internal.cc b/utilities/write_batch_with_index/write_batch_with_index_internal.cc index 4191e84e0..2c0033ce1 100644 --- a/utilities/write_batch_with_index/write_batch_with_index_internal.cc +++ b/utilities/write_batch_with_index/write_batch_with_index_internal.cc @@ -3,6 +3,8 @@ // 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 "db/column_family.h" #include "db/merge_context.h" #include "db/merge_helper.h" @@ -241,3 +243,5 @@ WriteBatchWithIndexInternal::Result WriteBatchWithIndexInternal::GetFromBatch( } } // namespace rocksdb + +#endif // !ROCKSDB_LITE diff --git a/utilities/write_batch_with_index/write_batch_with_index_internal.h b/utilities/write_batch_with_index/write_batch_with_index_internal.h index a98ddd67e..d1a4ffc91 100644 --- a/utilities/write_batch_with_index/write_batch_with_index_internal.h +++ b/utilities/write_batch_with_index/write_batch_with_index_internal.h @@ -3,6 +3,8 @@ // 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 + #pragma once #include @@ -94,3 +96,4 @@ class WriteBatchWithIndexInternal { }; } // namespace rocksdb +#endif // !ROCKSDB_LITE diff --git a/utilities/write_batch_with_index/write_batch_with_index_test.cc b/utilities/write_batch_with_index/write_batch_with_index_test.cc index 488d1b70a..70337f885 100644 --- a/utilities/write_batch_with_index/write_batch_with_index_test.cc +++ b/utilities/write_batch_with_index/write_batch_with_index_test.cc @@ -7,6 +7,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. +#ifndef ROCKSDB_LITE #include #include @@ -1370,3 +1371,13 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } + +#else +#include + +int main() { + fprintf(stderr, "SKIPPED\n"); + return 0; +} + +#endif // !ROCKSDB_LITE