Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433)

Summary:
When dynamically linking two binaries together, different builds of RocksDB from two sources might cause errors. To provide a tool for user to solve the problem, the RocksDB namespace is changed to a flag which can be overridden in build time.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6433

Test Plan: Build release, all and jtest. Try to build with ROCKSDB_NAMESPACE with another flag.

Differential Revision: D19977691

fbshipit-source-id: aa7f2d0972e1c31d75339ac48478f34f6cfcfb3e

5 files changed, 16 insertions, 14 deletions

diff --git a/trace_replay/block_cache_tracer.cc b/trace_replay/block_cache_tracer.cc
index 0cf394afa..9a96f1bac 100644
--- a/trace_replay/block_cache_tracer.cc
+++ b/trace_replay/block_cache_tracer.cc
@@ -16,7 +16,7 @@
 #include "util/hash.h"
 #include "util/string_util.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 namespace {
 const unsigned int kCharSize = 1;
@@ -312,7 +312,8 @@ BlockCacheHumanReadableTraceWriter::~BlockCacheHumanReadableTraceWriter() {
 }
 
 Status BlockCacheHumanReadableTraceWriter::NewWritableFile(
-    const std::string& human_readable_trace_file_path, rocksdb::Env* env) {
+    const std::string& human_readable_trace_file_path,
+    ROCKSDB_NAMESPACE::Env* env) {
   if (human_readable_trace_file_path.empty()) {
     return Status::InvalidArgument(
         "The provided human_readable_trace_file_path is null.");
@@ -493,4 +494,4 @@ uint64_t BlockCacheTracer::NextGetId() {
   return prev_value;
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
diff --git a/trace_replay/block_cache_tracer.h b/trace_replay/block_cache_tracer.h
index 7c03e611d..5849273dc 100644
--- a/trace_replay/block_cache_tracer.h
+++ b/trace_replay/block_cache_tracer.h
@@ -15,7 +15,7 @@
 #include "table/table_reader_caller.h"
 #include "trace_replay/trace_replay.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 extern const uint64_t kMicrosInSecond;
 extern const uint64_t kSecondInMinute;
@@ -204,14 +204,15 @@ class BlockCacheHumanReadableTraceWriter {
   ~BlockCacheHumanReadableTraceWriter();
 
   Status NewWritableFile(const std::string& human_readable_trace_file_path,
-                         rocksdb::Env* env);
+                         ROCKSDB_NAMESPACE::Env* env);
 
   Status WriteHumanReadableTraceRecord(const BlockCacheTraceRecord& access,
                                        uint64_t block_id, uint64_t get_key_id);
 
  private:
   char trace_record_buffer_[1024 * 1024];
-  std::unique_ptr<rocksdb::WritableFile> human_readable_trace_file_writer_;
+  std::unique_ptr<ROCKSDB_NAMESPACE::WritableFile>
+      human_readable_trace_file_writer_;
 };
 
 // BlockCacheTraceReader helps read the trace file generated by
@@ -290,4 +291,4 @@ class BlockCacheTracer {
   std::atomic<uint64_t> get_id_counter_;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
diff --git a/trace_replay/block_cache_tracer_test.cc b/trace_replay/block_cache_tracer_test.cc
index cc245c30e..b29600890 100644
--- a/trace_replay/block_cache_tracer_test.cc
+++ b/trace_replay/block_cache_tracer_test.cc
@@ -10,7 +10,7 @@
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 namespace {
 const uint64_t kBlockSize = 1024;
@@ -27,7 +27,7 @@ class BlockCacheTracerTest : public testing::Test {
  public:
   BlockCacheTracerTest() {
     test_path_ = test::PerThreadDBPath("block_cache_tracer_test");
-    env_ = rocksdb::Env::Default();
+    env_ = ROCKSDB_NAMESPACE::Env::Default();
     EXPECT_OK(env_->CreateDir(test_path_));
     trace_file_path_ = test_path_ + "/block_cache_trace";
   }
@@ -370,7 +370,7 @@ TEST_F(BlockCacheTracerTest, HumanReadableTrace) {
   }
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
diff --git a/trace_replay/trace_replay.cc b/trace_replay/trace_replay.cc
index 41d98829b..a0f9a504f 100644
--- a/trace_replay/trace_replay.cc
+++ b/trace_replay/trace_replay.cc
@@ -15,7 +15,7 @@
 #include "util/string_util.h"
 #include "util/threadpool_imp.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 const std::string kTraceMagic = "feedcafedeadbeef";
 
@@ -482,4 +482,4 @@ void Replayer::BGWorkIterSeekForPrev(void* arg) {
   return;
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
diff --git a/trace_replay/trace_replay.h b/trace_replay/trace_replay.h
index 776a1e0ca..e7ef598f0 100644
--- a/trace_replay/trace_replay.h
+++ b/trace_replay/trace_replay.h
@@ -13,7 +13,7 @@
 #include "rocksdb/options.h"
 #include "rocksdb/trace_reader_writer.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 // This file contains Tracer and Replayer classes that enable capturing and
 // replaying RocksDB traces.
@@ -186,4 +186,4 @@ struct ReplayerWorkerArg {
   ReadOptions roptions;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE