From de3fb9a6ff7cbe77459f817815e58f89b75f468d Mon Sep 17 00:00:00 2001 From: Zhongyi Xie Date: Sat, 10 Aug 2019 19:12:09 -0700 Subject: [PATCH] exclude TEST_ENV_URI from rocksdb lite (#5686) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: PR https://github.com/facebook/rocksdb/pull/5676 added some test coverage for `TEST_ENV_URI`, which unfortunately isn't supported in lite mode, causing some test failures for rocksdb lite. For example, ``` db/db_test_util.cc: In constructor ‘rocksdb::DBTestBase::DBTestBase(std::__cxx11::string)’: db/db_test_util.cc:57:16: error: ‘ObjectRegistry’ has not been declared Status s = ObjectRegistry::NewInstance()->NewSharedObject(test_env_uri, ^ ``` This PR fixes these errors by excluding the new code from test functions for lite mode. Pull Request resolved: https://github.com/facebook/rocksdb/pull/5686 Differential Revision: D16749000 Pulled By: miasantreble fbshipit-source-id: e8b3088c31a78b3dffc5fe7814261909d2c3e369 --- db/column_family_test.cc | 4 +++- db/db_test_util.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/db/column_family_test.cc b/db/column_family_test.cc index b55d50a49..235313f48 100644 --- a/db/column_family_test.cc +++ b/db/column_family_test.cc @@ -63,8 +63,9 @@ class EnvCounter : public EnvWrapper { class ColumnFamilyTestBase : public testing::Test { public: explicit ColumnFamilyTestBase(uint32_t format) : rnd_(139), format_(format) { - const char* test_env_uri = getenv("TEST_ENV_URI"); Env* base_env = Env::Default(); +#ifndef ROCKSDB_LITE + const char* test_env_uri = getenv("TEST_ENV_URI"); if (test_env_uri) { Status s = ObjectRegistry::NewInstance()->NewSharedObject(test_env_uri, &env_guard_); @@ -72,6 +73,7 @@ class ColumnFamilyTestBase : public testing::Test { EXPECT_OK(s); EXPECT_NE(Env::Default(), base_env); } +#endif // !ROCKSDB_LITE EXPECT_NE(nullptr, base_env); env_ = new EnvCounter(base_env); dbname_ = test::PerThreadDBPath("column_family_test"); diff --git a/db/db_test_util.cc b/db/db_test_util.cc index 7abee3504..da71429a7 100644 --- a/db/db_test_util.cc +++ b/db/db_test_util.cc @@ -51,8 +51,9 @@ DBTestBase::DBTestBase(const std::string path) : mem_env_(nullptr), encrypted_env_(nullptr), option_config_(kDefault) { - const char* test_env_uri = getenv("TEST_ENV_URI"); Env* base_env = Env::Default(); +#ifndef ROCKSDB_LITE + const char* test_env_uri = getenv("TEST_ENV_URI"); if (test_env_uri) { Status s = ObjectRegistry::NewInstance()->NewSharedObject(test_env_uri, &env_guard_); @@ -60,6 +61,7 @@ DBTestBase::DBTestBase(const std::string path) EXPECT_OK(s); EXPECT_NE(Env::Default(), base_env); } +#endif // !ROCKSDB_LITE EXPECT_NE(nullptr, base_env); if (getenv("MEM_ENV")) { mem_env_ = new MockEnv(base_env);