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

1 files changed, 13 insertions, 9 deletions

diff --git a/java/rocksjni/write_buffer_manager.cc b/java/rocksjni/write_buffer_manager.cc
index 043f69031..a52daed7d 100644
--- a/java/rocksjni/write_buffer_manager.cc
+++ b/java/rocksjni/write_buffer_manager.cc
@@ -17,11 +17,14 @@
  */
 jlong Java_org_rocksdb_WriteBufferManager_newWriteBufferManager(
         JNIEnv* /*env*/, jclass /*jclazz*/, jlong jbuffer_size, jlong jcache_handle) {
-    auto* cache_ptr =
-            reinterpret_cast<std::shared_ptr<rocksdb::Cache> *>(jcache_handle);
-    auto* write_buffer_manager = new std::shared_ptr<rocksdb::WriteBufferManager>(
-            std::make_shared<rocksdb::WriteBufferManager>(jbuffer_size, *cache_ptr));
-    return reinterpret_cast<jlong>(write_buffer_manager);
+  auto* cache_ptr =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::Cache>*>(
+          jcache_handle);
+  auto* write_buffer_manager =
+      new std::shared_ptr<ROCKSDB_NAMESPACE::WriteBufferManager>(
+          std::make_shared<ROCKSDB_NAMESPACE::WriteBufferManager>(jbuffer_size,
+                                                                  *cache_ptr));
+  return reinterpret_cast<jlong>(write_buffer_manager);
 }
 
 /*
@@ -31,8 +34,9 @@ jlong Java_org_rocksdb_WriteBufferManager_newWriteBufferManager(
  */
 void Java_org_rocksdb_WriteBufferManager_disposeInternal(
         JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-    auto* write_buffer_manager =
-            reinterpret_cast<std::shared_ptr<rocksdb::WriteBufferManager> *>(jhandle);
-    assert(write_buffer_manager != nullptr);
-    delete write_buffer_manager;
+  auto* write_buffer_manager =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::WriteBufferManager>*>(
+          jhandle);
+  assert(write_buffer_manager != nullptr);
+  delete write_buffer_manager;
 }