andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Env::LoadEnv to create custom Env objects (#6196)

Browse Source 
Summary:
As title. Previous assumption was that the underlying lib can always return
a shared_ptr<Env>. This is too strong. Therefore, we use Env::LoadEnv to relax
it.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6196

Test Plan: make check

Differential Revision: D19133199

Pulled By: riversand963

fbshipit-source-id: c83a0c02a42610d077054f2de1acfc45126b3a75
This commit is contained in:
Yanqin Jin 2019-12-16 20:00:43 -08:00 committed by Facebook Github Bot
parent 68d5d82d1f
commit 7678cf2df7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/column_family_test.cc
View File

@ -67,9 +67,9 @@ class ColumnFamilyTestBase : public testing::Test {
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
const char* test_env_uri = getenv("TEST_ENV_URI"); const char* test_env_uri = getenv("TEST_ENV_URI");
if (test_env_uri) { if (test_env_uri) {
Status s = ObjectRegistry::NewInstance()->NewSharedObject(test_env_uri, Env* test_env = nullptr;
&env_guard_); Status s = Env::LoadEnv(test_env_uri, &test_env, &env_guard_);
base_env = env_guard_.get(); base_env = test_env;
EXPECT_OK(s); EXPECT_OK(s);
EXPECT_NE(Env::Default(), base_env); EXPECT_NE(Env::Default(), base_env);
} }

6
db/db_test_util.cc
View File

@ -53,9 +53,9 @@ DBTestBase::DBTestBase(const std::string path)
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
const char* test_env_uri = getenv("TEST_ENV_URI"); const char* test_env_uri = getenv("TEST_ENV_URI");
if (test_env_uri) { if (test_env_uri) {
Status s = ObjectRegistry::NewInstance()->NewSharedObject(test_env_uri, Env* test_env = nullptr;
&env_guard_); Status s = Env::LoadEnv(test_env_uri, &test_env, &env_guard_);
base_env = env_guard_.get(); base_env = test_env;
EXPECT_OK(s); EXPECT_OK(s);
EXPECT_NE(Env::Default(), base_env); EXPECT_NE(Env::Default(), base_env);
} }