1 files changed, 35 insertions, 20 deletions
diff --git a/java/rocksjni/compact_range_options.cc b/java/rocksjni/compact_range_options.cc
index cc9ac859e..af5a200e7 100644
--- a/java/rocksjni/compact_range_options.cc
+++ b/java/rocksjni/compact_range_options.cc
@@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 // This file implements the "bridge" between Java and C++ for
-// rocksdb::CompactRangeOptions.
+// ROCKSDB_NAMESPACE::CompactRangeOptions.
 
 #include <jni.h>
 
@@ -19,7 +19,7 @@
  */
 jlong Java_org_rocksdb_CompactRangeOptions_newCompactRangeOptions(
     JNIEnv* /*env*/, jclass /*jclazz*/) {
-  auto* options = new rocksdb::CompactRangeOptions();
+  auto* options = new ROCKSDB_NAMESPACE::CompactRangeOptions();
   return reinterpret_cast<jlong>(options);
 }
 
@@ -31,7 +31,8 @@ jlong Java_org_rocksdb_CompactRangeOptions_newCompactRangeOptions(
  */
 jboolean Java_org_rocksdb_CompactRangeOptions_exclusiveManualCompaction(
     JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   return static_cast<jboolean>(options->exclusive_manual_compaction);
 }
 
@@ -43,7 +44,7 @@ jboolean Java_org_rocksdb_CompactRangeOptions_exclusiveManualCompaction(
 void Java_org_rocksdb_CompactRangeOptions_setExclusiveManualCompaction(
     JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jboolean exclusive_manual_compaction) {
   auto* options =
-      reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->exclusive_manual_compaction = static_cast<bool>(exclusive_manual_compaction);
 }
 
@@ -55,9 +56,10 @@ void Java_org_rocksdb_CompactRangeOptions_setExclusiveManualCompaction(
  */
 jint Java_org_rocksdb_CompactRangeOptions_bottommostLevelCompaction(
     JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
-  return rocksdb::BottommostLevelCompactionJni::toJavaBottommostLevelCompaction(
-    options->bottommost_level_compaction);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::BottommostLevelCompactionJni::
+      toJavaBottommostLevelCompaction(options->bottommost_level_compaction);
 }
 
 /*
@@ -68,9 +70,11 @@ jint Java_org_rocksdb_CompactRangeOptions_bottommostLevelCompaction(
 void Java_org_rocksdb_CompactRangeOptions_setBottommostLevelCompaction(
     JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
     jint bottommost_level_compaction) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->bottommost_level_compaction =
-    rocksdb::BottommostLevelCompactionJni::toCppBottommostLevelCompaction(bottommost_level_compaction);
+      ROCKSDB_NAMESPACE::BottommostLevelCompactionJni::
+          toCppBottommostLevelCompaction(bottommost_level_compaction);
 }
 
 /*
@@ -80,7 +84,8 @@ void Java_org_rocksdb_CompactRangeOptions_setBottommostLevelCompaction(
  */
 jboolean Java_org_rocksdb_CompactRangeOptions_changeLevel
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   return static_cast<jboolean>(options->change_level);
 }
 
@@ -91,7 +96,8 @@ jboolean Java_org_rocksdb_CompactRangeOptions_changeLevel
  */
 void Java_org_rocksdb_CompactRangeOptions_setChangeLevel
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jboolean change_level) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->change_level = static_cast<bool>(change_level);
 }
 
@@ -102,7 +108,8 @@ void Java_org_rocksdb_CompactRangeOptions_setChangeLevel
  */
 jint Java_org_rocksdb_CompactRangeOptions_targetLevel
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   return static_cast<jint>(options->target_level);
 }
 
@@ -113,7 +120,8 @@ jint Java_org_rocksdb_CompactRangeOptions_targetLevel
  */
 void Java_org_rocksdb_CompactRangeOptions_setTargetLevel
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint target_level) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->target_level = static_cast<int>(target_level);
 }
 
@@ -124,7 +132,8 @@ void Java_org_rocksdb_CompactRangeOptions_setTargetLevel
  */
 jint Java_org_rocksdb_CompactRangeOptions_targetPathId
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   return static_cast<jint>(options->target_path_id);
 }
 
@@ -135,7 +144,8 @@ jint Java_org_rocksdb_CompactRangeOptions_targetPathId
  */
 void Java_org_rocksdb_CompactRangeOptions_setTargetPathId
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint target_path_id) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->target_path_id = static_cast<uint32_t>(target_path_id);
 }
 
@@ -146,7 +156,8 @@ void Java_org_rocksdb_CompactRangeOptions_setTargetPathId
  */
 jboolean Java_org_rocksdb_CompactRangeOptions_allowWriteStall
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   return static_cast<jboolean>(options->allow_write_stall);
 }
 
@@ -157,7 +168,8 @@ jboolean Java_org_rocksdb_CompactRangeOptions_allowWriteStall
  */
 void Java_org_rocksdb_CompactRangeOptions_setAllowWriteStall
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jboolean allow_write_stall) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->allow_write_stall = static_cast<bool>(allow_write_stall);
 }
 
@@ -169,7 +181,8 @@ void Java_org_rocksdb_CompactRangeOptions_setAllowWriteStall
  */
 jint Java_org_rocksdb_CompactRangeOptions_maxSubcompactions
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   return static_cast<jint>(options->max_subcompactions);
 }
 
@@ -180,7 +193,8 @@ jint Java_org_rocksdb_CompactRangeOptions_maxSubcompactions
  */
 void Java_org_rocksdb_CompactRangeOptions_setMaxSubcompactions
   (JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint max_subcompactions) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   options->max_subcompactions = static_cast<uint32_t>(max_subcompactions);
 }
 
@@ -191,6 +205,7 @@ void Java_org_rocksdb_CompactRangeOptions_setMaxSubcompactions
  */
 void Java_org_rocksdb_CompactRangeOptions_disposeInternal(
     JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::CompactRangeOptions*>(jhandle);
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactRangeOptions*>(jhandle);
   delete options;
 }