From 02ac6c9a3cee78816cec68540626df3dfb3ca9d7 Mon Sep 17 00:00:00 2001 From: sdong Date: Wed, 29 Jan 2020 12:55:58 -0800 Subject: [PATCH] Fix db_bloom_filter_test clang LITE build (#6340) Summary: db_bloom_filter_test break with clang LITE build with following message: db/db_bloom_filter_test.cc:23:29: error: unused variable 'kPlainTable' [-Werror,-Wunused-const-variable] static constexpr PseudoMode kPlainTable = -1; ^ Fix it by moving the declaration out of LITE build Pull Request resolved: https://github.com/facebook/rocksdb/pull/6340 Test Plan: USE_CLANG=1 LITE=1 make db_bloom_filter_test and without LITE=1 Differential Revision: D19609834 fbshipit-source-id: 0e88f5c6759238a94f9880d84c785ac18e7cdd7e --- db/db_bloom_filter_test.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/db/db_bloom_filter_test.cc b/db/db_bloom_filter_test.cc index b31c935e8..417552ad8 100644 --- a/db/db_bloom_filter_test.cc +++ b/db/db_bloom_filter_test.cc @@ -16,12 +16,6 @@ namespace rocksdb { namespace { using BFP = BloomFilterPolicy; - -namespace BFP2 { -// Extends BFP::Mode with option to use Plain table -using PseudoMode = int; -static constexpr PseudoMode kPlainTable = -1; -} // namespace BFP2 } // namespace // DB tests related to bloom filter. @@ -1031,6 +1025,14 @@ TEST_F(DBBloomFilterTest, MemtablePrefixBloomOutOfDomain) { } #ifndef ROCKSDB_LITE +namespace { +namespace BFP2 { +// Extends BFP::Mode with option to use Plain table +using PseudoMode = int; +static constexpr PseudoMode kPlainTable = -1; +} // namespace BFP2 +} // namespace + class BloomStatsTestWithParam : public DBBloomFilterTest, public testing::WithParamInterface> {