]> git.proxmox.com Git - ceph.git/blobdiff - ceph/src/rocksdb/java/rocksjni/options.cc
update source to Ceph Pacific 16.2.2
[ceph.git] / ceph / src / rocksdb / java / rocksjni / options.cc
index 9aed80e1e665c6a859944d41a212791e5cec5704..c13613373d123cd1d50efd0f410afe9c3c739e22 100644 (file)
@@ -3,7 +3,8 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-// This file implements the "bridge" between Java and C++ for rocksdb::Options.
+// This file implements the "bridge" between Java and C++ for
+// ROCKSDB_NAMESPACE::Options.
 
 #include <jni.h>
 #include <stdio.h>
@@ -22,6 +23,7 @@
 #include "rocksjni/comparatorjnicallback.h"
 #include "rocksjni/portal.h"
 #include "rocksjni/statisticsjni.h"
+#include "rocksjni/table_filter_jnicallback.h"
 
 #include "rocksdb/comparator.h"
 #include "rocksdb/convenience.h"
@@ -40,8 +42,9 @@
  * Method:    newOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_Options_newOptions__(JNIEnv* /*env*/, jclass /*jcls*/) {
-  auto* op = new rocksdb::Options();
+jlong Java_org_rocksdb_Options_newOptions__(
+    JNIEnv*, jclass) {
+  auto* op = new ROCKSDB_NAMESPACE::Options();
   return reinterpret_cast<jlong>(op);
 }
 
@@ -50,13 +53,13 @@ jlong Java_org_rocksdb_Options_newOptions__(JNIEnv* /*env*/, jclass /*jcls*/) {
  * Method:    newOptions
  * Signature: (JJ)J
  */
-jlong Java_org_rocksdb_Options_newOptions__JJ(JNIEnv* /*env*/, jclass /*jcls*/,
-                                              jlong jdboptions,
-                                              jlong jcfoptions) {
-  auto* dbOpt = reinterpret_cast<const rocksdb::DBOptions*>(jdboptions);
-  auto* cfOpt =
-      reinterpret_cast<const rocksdb::ColumnFamilyOptions*>(jcfoptions);
-  auto* op = new rocksdb::Options(*dbOpt, *cfOpt);
+jlong Java_org_rocksdb_Options_newOptions__JJ(
+    JNIEnv*, jclass, jlong jdboptions, jlong jcfoptions) {
+  auto* dbOpt =
+      reinterpret_cast<const ROCKSDB_NAMESPACE::DBOptions*>(jdboptions);
+  auto* cfOpt = reinterpret_cast<const ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(
+      jcfoptions);
+  auto* op = new ROCKSDB_NAMESPACE::Options(*dbOpt, *cfOpt);
   return reinterpret_cast<jlong>(op);
 }
 
@@ -65,10 +68,10 @@ jlong Java_org_rocksdb_Options_newOptions__JJ(JNIEnv* /*env*/, jclass /*jcls*/,
  * Method:    copyOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_copyOptions(JNIEnv* /*env*/, jclass /*jcls*/,
-                                           jlong jhandle) {
-  auto new_opt =
-      new rocksdb::Options(*(reinterpret_cast<rocksdb::Options*>(jhandle)));
+jlong Java_org_rocksdb_Options_copyOptions(
+    JNIEnv*, jclass, jlong jhandle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::Options(
+      *(reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)));
   return reinterpret_cast<jlong>(new_opt);
 }
 
@@ -77,9 +80,9 @@ jlong Java_org_rocksdb_Options_copyOptions(JNIEnv* /*env*/, jclass /*jcls*/,
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_Options_disposeInternal(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong handle) {
-  auto* op = reinterpret_cast<rocksdb::Options*>(handle);
+void Java_org_rocksdb_Options_disposeInternal(
+    JNIEnv*, jobject, jlong handle) {
+  auto* op = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(handle);
   assert(op != nullptr);
   delete op;
 }
@@ -89,11 +92,9 @@ void Java_org_rocksdb_Options_disposeInternal(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setIncreaseParallelism
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setIncreaseParallelism(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle,
-                                                     jint totalThreads) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->IncreaseParallelism(
+void Java_org_rocksdb_Options_setIncreaseParallelism(
+    JNIEnv*, jobject, jlong jhandle, jint totalThreads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->IncreaseParallelism(
       static_cast<int>(totalThreads));
 }
 
@@ -102,10 +103,10 @@ void Java_org_rocksdb_Options_setIncreaseParallelism(JNIEnv* /*env*/,
  * Method:    setCreateIfMissing
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setCreateIfMissing(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle, jboolean flag) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->create_if_missing = flag;
+void Java_org_rocksdb_Options_setCreateIfMissing(
+    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->create_if_missing =
+      flag;
 }
 
 /*
@@ -113,10 +114,10 @@ void Java_org_rocksdb_Options_setCreateIfMissing(JNIEnv* /*env*/,
  * Method:    createIfMissing
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_createIfMissing(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->create_if_missing;
+jboolean Java_org_rocksdb_Options_createIfMissing(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->create_if_missing;
 }
 
 /*
@@ -124,12 +125,10 @@ jboolean Java_org_rocksdb_Options_createIfMissing(JNIEnv* /*env*/,
  * Method:    setCreateMissingColumnFamilies
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setCreateMissingColumnFamilies(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle,
-                                                             jboolean flag) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->create_missing_column_families =
-      flag;
+void Java_org_rocksdb_Options_setCreateMissingColumnFamilies(
+    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->create_missing_column_families = flag;
 }
 
 /*
@@ -137,10 +136,9 @@ void Java_org_rocksdb_Options_setCreateMissingColumnFamilies(JNIEnv* /*env*/,
  * Method:    createMissingColumnFamilies
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_createMissingColumnFamilies(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jboolean Java_org_rocksdb_Options_createMissingColumnFamilies(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->create_missing_column_families;
 }
 
@@ -149,18 +147,16 @@ jboolean Java_org_rocksdb_Options_createMissingColumnFamilies(JNIEnv* /*env*/,
  * Method:    setComparatorHandle
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setComparatorHandle__JI(JNIEnv* /*env*/,
-                                                      jobject /*jobj*/,
-                                                      jlong jhandle,
-                                                      jint builtinComparator) {
+void Java_org_rocksdb_Options_setComparatorHandle__JI(
+    JNIEnv*, jobject, jlong jhandle, jint builtinComparator) {
   switch (builtinComparator) {
     case 1:
-      reinterpret_cast<rocksdb::Options*>(jhandle)->comparator =
-          rocksdb::ReverseBytewiseComparator();
+      reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->comparator =
+          ROCKSDB_NAMESPACE::ReverseBytewiseComparator();
       break;
     default:
-      reinterpret_cast<rocksdb::Options*>(jhandle)->comparator =
-          rocksdb::BytewiseComparator();
+      reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->comparator =
+          ROCKSDB_NAMESPACE::BytewiseComparator();
       break;
   }
 }
@@ -170,31 +166,24 @@ void Java_org_rocksdb_Options_setComparatorHandle__JI(JNIEnv* /*env*/,
  * Method:    setComparatorHandle
  * Signature: (JJB)V
  */
-void Java_org_rocksdb_Options_setComparatorHandle__JJB(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jopt_handle,
-                                                       jlong jcomparator_handle,
-                                                       jbyte jcomparator_type) {
-  rocksdb::Comparator* comparator = nullptr;
+void Java_org_rocksdb_Options_setComparatorHandle__JJB(
+    JNIEnv*, jobject, jlong jopt_handle, jlong jcomparator_handle,
+    jbyte jcomparator_type) {
+  ROCKSDB_NAMESPACE::Comparator* comparator = nullptr;
   switch (jcomparator_type) {
     // JAVA_COMPARATOR
     case 0x0:
-      comparator =
-          reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
-      break;
-
-    // JAVA_DIRECT_COMPARATOR
-    case 0x1:
-      comparator = reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(
+      comparator = reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallback*>(
           jcomparator_handle);
       break;
 
     // JAVA_NATIVE_COMPARATOR_WRAPPER
-    case 0x2:
-      comparator = reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
+    case 0x1:
+      comparator =
+          reinterpret_cast<ROCKSDB_NAMESPACE::Comparator*>(jcomparator_handle);
       break;
   }
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jopt_handle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jopt_handle);
   opt->comparator = comparator;
 }
 
@@ -203,19 +192,17 @@ void Java_org_rocksdb_Options_setComparatorHandle__JJB(JNIEnv* /*env*/,
  * Method:    setMergeOperatorName
  * Signature: (JJjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setMergeOperatorName(JNIEnv* env,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jstring jop_name) {
+void Java_org_rocksdb_Options_setMergeOperatorName(
+    JNIEnv* env, jobject, jlong jhandle, jstring jop_name) {
   const char* op_name = env->GetStringUTFChars(jop_name, nullptr);
   if (op_name == nullptr) {
     // exception thrown: OutOfMemoryError
     return;
   }
 
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   options->merge_operator =
-      rocksdb::MergeOperators::CreateFromStringId(op_name);
+      ROCKSDB_NAMESPACE::MergeOperators::CreateFromStringId(op_name);
 
   env->ReleaseStringUTFChars(jop_name, op_name);
 }
@@ -225,40 +212,83 @@ void Java_org_rocksdb_Options_setMergeOperatorName(JNIEnv* env,
  * Method:    setMergeOperator
  * Signature: (JJjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setMergeOperator(JNIEnv* /*env*/,
-                                               jobject /*jobj*/, jlong jhandle,
-                                               jlong mergeOperatorHandle) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->merge_operator =
-      *(reinterpret_cast<std::shared_ptr<rocksdb::MergeOperator>*>(
+void Java_org_rocksdb_Options_setMergeOperator(
+    JNIEnv*, jobject, jlong jhandle, jlong mergeOperatorHandle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->merge_operator =
+      *(reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::MergeOperator>*>(
           mergeOperatorHandle));
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setCompactionFilterHandle
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setCompactionFilterHandle(
+    JNIEnv*, jobject, jlong jopt_handle,
+    jlong jcompactionfilter_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jopt_handle)
+      ->compaction_filter =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactionFilter*>(
+          jcompactionfilter_handle);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setCompactionFilterFactoryHandle
+ * Signature: (JJ)V
+ */
+void JNICALL Java_org_rocksdb_Options_setCompactionFilterFactoryHandle(
+    JNIEnv*, jobject, jlong jopt_handle,
+    jlong jcompactionfilterfactory_handle) {
+  auto* cff_factory = reinterpret_cast<
+      std::shared_ptr<ROCKSDB_NAMESPACE::CompactionFilterFactory>*>(
+      jcompactionfilterfactory_handle);
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jopt_handle)
+      ->compaction_filter_factory = *cff_factory;
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setWriteBufferSize
  * Signature: (JJ)I
  */
-void Java_org_rocksdb_Options_setWriteBufferSize(JNIEnv* env, jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jlong jwrite_buffer_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(jwrite_buffer_size);
+void Java_org_rocksdb_Options_setWriteBufferSize(
+    JNIEnv* env, jobject, jlong jhandle, jlong jwrite_buffer_size) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jwrite_buffer_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->write_buffer_size =
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->write_buffer_size =
         jwrite_buffer_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setWriteBufferManager
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setWriteBufferManager(
+    JNIEnv*, jobject, jlong joptions_handle,
+    jlong jwrite_buffer_manager_handle) {
+  auto* write_buffer_manager =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::WriteBufferManager>*>(
+          jwrite_buffer_manager_handle);
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(joptions_handle)
+      ->write_buffer_manager = *write_buffer_manager;
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    writeBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writeBufferSize(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->write_buffer_size;
+jlong Java_org_rocksdb_Options_writeBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->write_buffer_size;
 }
 
 /*
@@ -267,10 +297,10 @@ jlong Java_org_rocksdb_Options_writeBufferSize(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMaxWriteBufferNumber(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jmax_write_buffer_number) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_write_buffer_number =
-      jmax_write_buffer_number;
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_write_buffer_number = jmax_write_buffer_number;
 }
 
 /*
@@ -278,12 +308,12 @@ void Java_org_rocksdb_Options_setMaxWriteBufferNumber(
  * Method:    setStatistics
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setStatistics(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle,
-                                            jlong jstatistics_handle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  auto* pSptr = reinterpret_cast<std::shared_ptr<rocksdb::StatisticsJni>*>(
-      jstatistics_handle);
+void Java_org_rocksdb_Options_setStatistics(
+    JNIEnv*, jobject, jlong jhandle, jlong jstatistics_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  auto* pSptr =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::StatisticsJni>*>(
+          jstatistics_handle);
   opt->statistics = *pSptr;
 }
 
@@ -292,15 +322,15 @@ void Java_org_rocksdb_Options_setStatistics(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    statistics
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_statistics(JNIEnv* /*env*/, jobject /*jobj*/,
-                                          jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  std::shared_ptr<rocksdb::Statistics> sptr = opt->statistics;
+jlong Java_org_rocksdb_Options_statistics(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  std::shared_ptr<ROCKSDB_NAMESPACE::Statistics> sptr = opt->statistics;
   if (sptr == nullptr) {
     return 0;
   } else {
-    std::shared_ptr<rocksdb::Statistics>* pSptr =
-        new std::shared_ptr<rocksdb::Statistics>(sptr);
+    std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>* pSptr =
+        new std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>(sptr);
     return reinterpret_cast<jlong>(pSptr);
   }
 }
@@ -310,10 +340,10 @@ jlong Java_org_rocksdb_Options_statistics(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    maxWriteBufferNumber
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxWriteBufferNumber(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_write_buffer_number;
+jint Java_org_rocksdb_Options_maxWriteBufferNumber(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_write_buffer_number;
 }
 
 /*
@@ -321,10 +351,10 @@ jint Java_org_rocksdb_Options_maxWriteBufferNumber(JNIEnv* /*env*/,
  * Method:    errorIfExists
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_errorIfExists(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->error_if_exists;
+jboolean Java_org_rocksdb_Options_errorIfExists(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->error_if_exists;
 }
 
 /*
@@ -332,10 +362,9 @@ jboolean Java_org_rocksdb_Options_errorIfExists(JNIEnv* /*env*/,
  * Method:    setErrorIfExists
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setErrorIfExists(JNIEnv* /*env*/,
-                                               jobject /*jobj*/, jlong jhandle,
-                                               jboolean error_if_exists) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->error_if_exists =
+void Java_org_rocksdb_Options_setErrorIfExists(
+    JNIEnv*, jobject, jlong jhandle, jboolean error_if_exists) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->error_if_exists =
       static_cast<bool>(error_if_exists);
 }
 
@@ -344,10 +373,10 @@ void Java_org_rocksdb_Options_setErrorIfExists(JNIEnv* /*env*/,
  * Method:    paranoidChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_paranoidChecks(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->paranoid_checks;
+jboolean Java_org_rocksdb_Options_paranoidChecks(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->paranoid_checks;
 }
 
 /*
@@ -355,10 +384,9 @@ jboolean Java_org_rocksdb_Options_paranoidChecks(JNIEnv* /*env*/,
  * Method:    setParanoidChecks
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setParanoidChecks(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jboolean paranoid_checks) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->paranoid_checks =
+void Java_org_rocksdb_Options_setParanoidChecks(
+    JNIEnv*, jobject, jlong jhandle, jboolean paranoid_checks) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->paranoid_checks =
       static_cast<bool>(paranoid_checks);
 }
 
@@ -367,10 +395,10 @@ void Java_org_rocksdb_Options_setParanoidChecks(JNIEnv* /*env*/,
  * Method:    setEnv
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setEnv(JNIEnv* /*env*/, jobject /*jobj*/,
-                                     jlong jhandle, jlong jenv) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->env =
-      reinterpret_cast<rocksdb::Env*>(jenv);
+void Java_org_rocksdb_Options_setEnv(
+    JNIEnv*, jobject, jlong jhandle, jlong jenv) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->env =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Env*>(jenv);
 }
 
 /*
@@ -378,11 +406,9 @@ void Java_org_rocksdb_Options_setEnv(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setMaxTotalWalSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setMaxTotalWalSize(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jlong jmax_total_wal_size) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_total_wal_size =
+void Java_org_rocksdb_Options_setMaxTotalWalSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_total_wal_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_total_wal_size =
       static_cast<jlong>(jmax_total_wal_size);
 }
 
@@ -391,10 +417,10 @@ void Java_org_rocksdb_Options_setMaxTotalWalSize(JNIEnv* /*env*/,
  * Method:    maxTotalWalSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxTotalWalSize(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_total_wal_size;
+jlong Java_org_rocksdb_Options_maxTotalWalSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_total_wal_size;
 }
 
 /*
@@ -402,9 +428,9 @@ jlong Java_org_rocksdb_Options_maxTotalWalSize(JNIEnv* /*env*/,
  * Method:    maxOpenFiles
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxOpenFiles(JNIEnv* /*env*/, jobject /*jobj*/,
-                                           jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_open_files;
+jint Java_org_rocksdb_Options_maxOpenFiles(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_open_files;
 }
 
 /*
@@ -412,10 +438,9 @@ jint Java_org_rocksdb_Options_maxOpenFiles(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setMaxOpenFiles
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxOpenFiles(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle,
-                                              jint max_open_files) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_open_files =
+void Java_org_rocksdb_Options_setMaxOpenFiles(
+    JNIEnv*, jobject, jlong jhandle, jint max_open_files) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_open_files =
       static_cast<int>(max_open_files);
 }
 
@@ -425,10 +450,9 @@ void Java_org_rocksdb_Options_setMaxOpenFiles(JNIEnv* /*env*/, jobject /*jobj*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMaxFileOpeningThreads(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jmax_file_opening_threads) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_file_opening_threads =
-      static_cast<int>(jmax_file_opening_threads);
+    JNIEnv*, jobject, jlong jhandle, jint jmax_file_opening_threads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_file_opening_threads = static_cast<int>(jmax_file_opening_threads);
 }
 
 /*
@@ -436,10 +460,9 @@ void Java_org_rocksdb_Options_setMaxFileOpeningThreads(
  * Method:    maxFileOpeningThreads
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxFileOpeningThreads(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jint Java_org_rocksdb_Options_maxFileOpeningThreads(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<int>(opt->max_file_opening_threads);
 }
 
@@ -448,9 +471,9 @@ jint Java_org_rocksdb_Options_maxFileOpeningThreads(JNIEnv* /*env*/,
  * Method:    useFsync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_useFsync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                           jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->use_fsync;
+jboolean Java_org_rocksdb_Options_useFsync(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->use_fsync;
 }
 
 /*
@@ -458,9 +481,9 @@ jboolean Java_org_rocksdb_Options_useFsync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setUseFsync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUseFsync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                          jlong jhandle, jboolean use_fsync) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->use_fsync =
+void Java_org_rocksdb_Options_setUseFsync(
+    JNIEnv*, jobject, jlong jhandle, jboolean use_fsync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->use_fsync =
       static_cast<bool>(use_fsync);
 }
 
@@ -469,10 +492,10 @@ void Java_org_rocksdb_Options_setUseFsync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setDbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_Options_setDbPaths(JNIEnv* env, jobject /*jobj*/,
-                                         jlong jhandle, jobjectArray jpaths,
-                                         jlongArray jtarget_sizes) {
-  std::vector<rocksdb::DbPath> db_paths;
+void Java_org_rocksdb_Options_setDbPaths(
+    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
+    jlongArray jtarget_sizes) {
+  std::vector<ROCKSDB_NAMESPACE::DbPath> db_paths;
   jlong* ptr_jtarget_size = env->GetLongArrayElements(jtarget_sizes, nullptr);
   if (ptr_jtarget_size == nullptr) {
     // exception thrown: OutOfMemoryError
@@ -489,7 +512,7 @@ void Java_org_rocksdb_Options_setDbPaths(JNIEnv* env, jobject /*jobj*/,
       env->ReleaseLongArrayElements(jtarget_sizes, ptr_jtarget_size, JNI_ABORT);
       return;
     }
-    std::string path = rocksdb::JniUtil::copyStdString(
+    std::string path = ROCKSDB_NAMESPACE::JniUtil::copyStdString(
         env, static_cast<jstring>(jpath), &has_exception);
     env->DeleteLocalRef(jpath);
 
@@ -501,12 +524,12 @@ void Java_org_rocksdb_Options_setDbPaths(JNIEnv* env, jobject /*jobj*/,
     jlong jtarget_size = ptr_jtarget_size[i];
 
     db_paths.push_back(
-        rocksdb::DbPath(path, static_cast<uint64_t>(jtarget_size)));
+        ROCKSDB_NAMESPACE::DbPath(path, static_cast<uint64_t>(jtarget_size)));
   }
 
   env->ReleaseLongArrayElements(jtarget_sizes, ptr_jtarget_size, JNI_ABORT);
 
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->db_paths = db_paths;
 }
 
@@ -515,9 +538,9 @@ void Java_org_rocksdb_Options_setDbPaths(JNIEnv* env, jobject /*jobj*/,
  * Method:    dbPathsLen
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_dbPathsLen(JNIEnv* /*env*/, jobject /*jobj*/,
-                                          jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_dbPathsLen(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->db_paths.size());
 }
 
@@ -526,19 +549,19 @@ jlong Java_org_rocksdb_Options_dbPathsLen(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    dbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_Options_dbPaths(JNIEnv* env, jobject /*jobj*/,
-                                      jlong jhandle, jobjectArray jpaths,
-                                      jlongArray jtarget_sizes) {
+void Java_org_rocksdb_Options_dbPaths(
+    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
+    jlongArray jtarget_sizes) {
   jlong* ptr_jtarget_size = env->GetLongArrayElements(jtarget_sizes, nullptr);
   if (ptr_jtarget_size == nullptr) {
     // exception thrown: OutOfMemoryError
     return;
   }
 
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   const jsize len = env->GetArrayLength(jpaths);
   for (jsize i = 0; i < len; i++) {
-    rocksdb::DbPath db_path = opt->db_paths[i];
+    ROCKSDB_NAMESPACE::DbPath db_path = opt->db_paths[i];
 
     jstring jpath = env->NewStringUTF(db_path.path.c_str());
     if (jpath == nullptr) {
@@ -565,10 +588,11 @@ void Java_org_rocksdb_Options_dbPaths(JNIEnv* env, jobject /*jobj*/,
  * Method:    dbLogDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_dbLogDir(JNIEnv* env, jobject /*jobj*/,
-                                          jlong jhandle) {
+jstring Java_org_rocksdb_Options_dbLogDir(
+    JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
-      reinterpret_cast<rocksdb::Options*>(jhandle)->db_log_dir.c_str());
+      reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+          ->db_log_dir.c_str());
 }
 
 /*
@@ -576,14 +600,15 @@ jstring Java_org_rocksdb_Options_dbLogDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    setDbLogDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setDbLogDir(JNIEnv* env, jobject /*jobj*/,
-                                          jlong jhandle, jstring jdb_log_dir) {
+void Java_org_rocksdb_Options_setDbLogDir(
+    JNIEnv* env, jobject, jlong jhandle, jstring jdb_log_dir) {
   const char* log_dir = env->GetStringUTFChars(jdb_log_dir, nullptr);
   if (log_dir == nullptr) {
     // exception thrown: OutOfMemoryError
     return;
   }
-  reinterpret_cast<rocksdb::Options*>(jhandle)->db_log_dir.assign(log_dir);
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->db_log_dir.assign(
+      log_dir);
   env->ReleaseStringUTFChars(jdb_log_dir, log_dir);
 }
 
@@ -592,10 +617,10 @@ void Java_org_rocksdb_Options_setDbLogDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    walDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_walDir(JNIEnv* env, jobject /*jobj*/,
-                                        jlong jhandle) {
+jstring Java_org_rocksdb_Options_walDir(
+    JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
-      reinterpret_cast<rocksdb::Options*>(jhandle)->wal_dir.c_str());
+      reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->wal_dir.c_str());
 }
 
 /*
@@ -603,14 +628,15 @@ jstring Java_org_rocksdb_Options_walDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    setWalDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setWalDir(JNIEnv* env, jobject /*jobj*/,
-                                        jlong jhandle, jstring jwal_dir) {
+void Java_org_rocksdb_Options_setWalDir(
+    JNIEnv* env, jobject, jlong jhandle, jstring jwal_dir) {
   const char* wal_dir = env->GetStringUTFChars(jwal_dir, nullptr);
   if (wal_dir == nullptr) {
     // exception thrown: OutOfMemoryError
     return;
   }
-  reinterpret_cast<rocksdb::Options*>(jhandle)->wal_dir.assign(wal_dir);
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->wal_dir.assign(
+      wal_dir);
   env->ReleaseStringUTFChars(jwal_dir, wal_dir);
 }
 
@@ -619,10 +645,9 @@ void Java_org_rocksdb_Options_setWalDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    deleteObsoleteFilesPeriodMicros
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_deleteObsoleteFilesPeriodMicros(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_deleteObsoleteFilesPeriodMicros(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->delete_obsolete_files_period_micros;
 }
 
@@ -632,8 +657,8 @@ jlong Java_org_rocksdb_Options_deleteObsoleteFilesPeriodMicros(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setDeleteObsoleteFilesPeriodMicros(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jlong micros) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong micros) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->delete_obsolete_files_period_micros = static_cast<int64_t>(micros);
 }
 
@@ -642,12 +667,10 @@ void Java_org_rocksdb_Options_setDeleteObsoleteFilesPeriodMicros(
  * Method:    setBaseBackgroundCompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setBaseBackgroundCompactions(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle,
-                                                           jint max) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->base_background_compactions =
-      static_cast<int>(max);
+void Java_org_rocksdb_Options_setBaseBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle, jint max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->base_background_compactions = static_cast<int>(max);
 }
 
 /*
@@ -655,10 +678,9 @@ void Java_org_rocksdb_Options_setBaseBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    baseBackgroundCompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_baseBackgroundCompactions(JNIEnv* /*env*/,
-                                                        jobject /*jobj*/,
-                                                        jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_baseBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->base_background_compactions;
 }
 
@@ -667,10 +689,9 @@ jint Java_org_rocksdb_Options_baseBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    maxBackgroundCompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxBackgroundCompactions(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_maxBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_background_compactions;
 }
 
@@ -679,12 +700,10 @@ jint Java_org_rocksdb_Options_maxBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    setMaxBackgroundCompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxBackgroundCompactions(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle,
-                                                          jint max) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_background_compactions =
-      static_cast<int>(max);
+void Java_org_rocksdb_Options_setMaxBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle, jint max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_background_compactions = static_cast<int>(max);
 }
 
 /*
@@ -692,10 +711,9 @@ void Java_org_rocksdb_Options_setMaxBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    setMaxSubcompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxSubcompactions(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle, jint max) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_subcompactions =
+void Java_org_rocksdb_Options_setMaxSubcompactions(
+    JNIEnv*, jobject, jlong jhandle, jint max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_subcompactions =
       static_cast<int32_t>(max);
 }
 
@@ -704,10 +722,10 @@ void Java_org_rocksdb_Options_setMaxSubcompactions(JNIEnv* /*env*/,
  * Method:    maxSubcompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxSubcompactions(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_subcompactions;
+jint Java_org_rocksdb_Options_maxSubcompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_subcompactions;
 }
 
 /*
@@ -715,10 +733,10 @@ jint Java_org_rocksdb_Options_maxSubcompactions(JNIEnv* /*env*/,
  * Method:    maxBackgroundFlushes
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxBackgroundFlushes(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_background_flushes;
+jint Java_org_rocksdb_Options_maxBackgroundFlushes(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_background_flushes;
 }
 
 /*
@@ -727,10 +745,9 @@ jint Java_org_rocksdb_Options_maxBackgroundFlushes(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMaxBackgroundFlushes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint max_background_flushes) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_background_flushes =
-      static_cast<int>(max_background_flushes);
+    JNIEnv*, jobject, jlong jhandle, jint max_background_flushes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_background_flushes = static_cast<int>(max_background_flushes);
 }
 
 /*
@@ -738,10 +755,10 @@ void Java_org_rocksdb_Options_setMaxBackgroundFlushes(
  * Method:    maxBackgroundJobs
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxBackgroundJobs(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_background_jobs;
+jint Java_org_rocksdb_Options_maxBackgroundJobs(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_background_jobs;
 }
 
 /*
@@ -749,11 +766,9 @@ jint Java_org_rocksdb_Options_maxBackgroundJobs(JNIEnv* /*env*/,
  * Method:    setMaxBackgroundJobs
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxBackgroundJobs(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jint max_background_jobs) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_background_jobs =
+void Java_org_rocksdb_Options_setMaxBackgroundJobs(
+    JNIEnv*, jobject, jlong jhandle, jint max_background_jobs) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_background_jobs =
       static_cast<int>(max_background_jobs);
 }
 
@@ -762,9 +777,10 @@ void Java_org_rocksdb_Options_setMaxBackgroundJobs(JNIEnv* /*env*/,
  * Method:    maxLogFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxLogFileSize(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_log_file_size;
+jlong Java_org_rocksdb_Options_maxLogFileSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_log_file_size;
 }
 
 /*
@@ -772,15 +788,15 @@ jlong Java_org_rocksdb_Options_maxLogFileSize(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setMaxLogFileSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setMaxLogFileSize(JNIEnv* env, jobject /*jobj*/,
-                                                jlong jhandle,
-                                                jlong max_log_file_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(max_log_file_size);
+void Java_org_rocksdb_Options_setMaxLogFileSize(
+    JNIEnv* env, jobject, jlong jhandle, jlong max_log_file_size) {
+  auto s =
+      ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(max_log_file_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->max_log_file_size =
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_log_file_size =
         max_log_file_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -789,10 +805,10 @@ void Java_org_rocksdb_Options_setMaxLogFileSize(JNIEnv* env, jobject /*jobj*/,
  * Method:    logFileTimeToRoll
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_logFileTimeToRoll(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->log_file_time_to_roll;
+jlong Java_org_rocksdb_Options_logFileTimeToRoll(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->log_file_time_to_roll;
 }
 
 /*
@@ -801,14 +817,14 @@ jlong Java_org_rocksdb_Options_logFileTimeToRoll(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setLogFileTimeToRoll(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle, jlong log_file_time_to_roll) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(log_file_time_to_roll);
+    JNIEnv* env, jobject, jlong jhandle, jlong log_file_time_to_roll) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      log_file_time_to_roll);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->log_file_time_to_roll =
-        log_file_time_to_roll;
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+        ->log_file_time_to_roll = log_file_time_to_roll;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -817,9 +833,10 @@ void Java_org_rocksdb_Options_setLogFileTimeToRoll(
  * Method:    keepLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_keepLogFileNum(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->keep_log_file_num;
+jlong Java_org_rocksdb_Options_keepLogFileNum(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->keep_log_file_num;
 }
 
 /*
@@ -827,15 +844,15 @@ jlong Java_org_rocksdb_Options_keepLogFileNum(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setKeepLogFileNum
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setKeepLogFileNum(JNIEnv* env, jobject /*jobj*/,
-                                                jlong jhandle,
-                                                jlong keep_log_file_num) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(keep_log_file_num);
+void Java_org_rocksdb_Options_setKeepLogFileNum(
+    JNIEnv* env, jobject, jlong jhandle, jlong keep_log_file_num) {
+  auto s =
+      ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(keep_log_file_num);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->keep_log_file_num =
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->keep_log_file_num =
         keep_log_file_num;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -844,10 +861,10 @@ void Java_org_rocksdb_Options_setKeepLogFileNum(JNIEnv* env, jobject /*jobj*/,
  * Method:    recycleLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_recycleLogFileNum(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->recycle_log_file_num;
+jlong Java_org_rocksdb_Options_recycleLogFileNum(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->recycle_log_file_num;
 }
 
 /*
@@ -855,16 +872,15 @@ jlong Java_org_rocksdb_Options_recycleLogFileNum(JNIEnv* /*env*/,
  * Method:    setRecycleLogFileNum
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setRecycleLogFileNum(JNIEnv* env,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jlong recycle_log_file_num) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(recycle_log_file_num);
+void Java_org_rocksdb_Options_setRecycleLogFileNum(
+    JNIEnv* env, jobject, jlong jhandle, jlong recycle_log_file_num) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      recycle_log_file_num);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->recycle_log_file_num =
-        recycle_log_file_num;
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+        ->recycle_log_file_num = recycle_log_file_num;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -873,21 +889,20 @@ void Java_org_rocksdb_Options_setRecycleLogFileNum(JNIEnv* env,
  * Method:    maxManifestFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxManifestFileSize(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_manifest_file_size;
+jlong Java_org_rocksdb_Options_maxManifestFileSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_manifest_file_size;
 }
 
 /*
  * Method:    memTableFactoryName
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_memTableFactoryName(JNIEnv* env,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  rocksdb::MemTableRepFactory* tf = opt->memtable_factory.get();
+jstring Java_org_rocksdb_Options_memTableFactoryName(
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  ROCKSDB_NAMESPACE::MemTableRepFactory* tf = opt->memtable_factory.get();
 
   // Should never be nullptr.
   // Default memtable factory is SkipListFactory
@@ -907,22 +922,21 @@ jstring Java_org_rocksdb_Options_memTableFactoryName(JNIEnv* env,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMaxManifestFileSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong max_manifest_file_size) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_manifest_file_size =
-      static_cast<int64_t>(max_manifest_file_size);
+    JNIEnv*, jobject, jlong jhandle, jlong max_manifest_file_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_manifest_file_size = static_cast<int64_t>(max_manifest_file_size);
 }
 
 /*
  * Method:    setMemTableFactory
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setMemTableFactory(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jlong jfactory_handle) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->memtable_factory.reset(
-      reinterpret_cast<rocksdb::MemTableRepFactory*>(jfactory_handle));
+void Java_org_rocksdb_Options_setMemTableFactory(
+    JNIEnv*, jobject, jlong jhandle, jlong jfactory_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->memtable_factory.reset(
+          reinterpret_cast<ROCKSDB_NAMESPACE::MemTableRepFactory*>(
+              jfactory_handle));
 }
 
 /*
@@ -930,13 +944,13 @@ void Java_org_rocksdb_Options_setMemTableFactory(JNIEnv* /*env*/,
  * Method:    setRateLimiter
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setRateLimiter(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle,
-                                             jlong jrate_limiter_handle) {
-  std::shared_ptr<rocksdb::RateLimiter>* pRateLimiter =
-      reinterpret_cast<std::shared_ptr<rocksdb::RateLimiter>*>(
+void Java_org_rocksdb_Options_setRateLimiter(
+    JNIEnv*, jobject, jlong jhandle, jlong jrate_limiter_handle) {
+  std::shared_ptr<ROCKSDB_NAMESPACE::RateLimiter>* pRateLimiter =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::RateLimiter>*>(
           jrate_limiter_handle);
-  reinterpret_cast<rocksdb::Options*>(jhandle)->rate_limiter = *pRateLimiter;
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->rate_limiter =
+      *pRateLimiter;
 }
 
 /*
@@ -945,12 +959,11 @@ void Java_org_rocksdb_Options_setRateLimiter(JNIEnv* /*env*/, jobject /*jobj*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setSstFileManager(
-    JNIEnv* /*env*/, jobject /*job*/, jlong jhandle,
-    jlong jsst_file_manager_handle) {
+    JNIEnv*, jobject, jlong jhandle, jlong jsst_file_manager_handle) {
   auto* sptr_sst_file_manager =
-      reinterpret_cast<std::shared_ptr<rocksdb::SstFileManager>*>(
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::SstFileManager>*>(
           jsst_file_manager_handle);
-  reinterpret_cast<rocksdb::Options*>(jhandle)->sst_file_manager =
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->sst_file_manager =
       *sptr_sst_file_manager;
 }
 
@@ -959,12 +972,12 @@ void Java_org_rocksdb_Options_setSstFileManager(
  * Method:    setLogger
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setLogger(JNIEnv* /*env*/, jobject /*jobj*/,
-                                        jlong jhandle, jlong jlogger_handle) {
-  std::shared_ptr<rocksdb::LoggerJniCallback>* pLogger =
-      reinterpret_cast<std::shared_ptr<rocksdb::LoggerJniCallback>*>(
+void Java_org_rocksdb_Options_setLogger(
+    JNIEnv*, jobject, jlong jhandle, jlong jlogger_handle) {
+  std::shared_ptr<ROCKSDB_NAMESPACE::LoggerJniCallback>* pLogger =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::LoggerJniCallback>*>(
           jlogger_handle);
-  reinterpret_cast<rocksdb::Options*>(jhandle)->info_log = *pLogger;
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->info_log = *pLogger;
 }
 
 /*
@@ -972,10 +985,10 @@ void Java_org_rocksdb_Options_setLogger(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setInfoLogLevel
  * Signature: (JB)V
  */
-void Java_org_rocksdb_Options_setInfoLogLevel(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle, jbyte jlog_level) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->info_log_level =
-      static_cast<rocksdb::InfoLogLevel>(jlog_level);
+void Java_org_rocksdb_Options_setInfoLogLevel(
+    JNIEnv*, jobject, jlong jhandle, jbyte jlog_level) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->info_log_level =
+      static_cast<ROCKSDB_NAMESPACE::InfoLogLevel>(jlog_level);
 }
 
 /*
@@ -983,10 +996,10 @@ void Java_org_rocksdb_Options_setInfoLogLevel(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    infoLogLevel
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_infoLogLevel(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
+jbyte Java_org_rocksdb_Options_infoLogLevel(
+    JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jbyte>(
-      reinterpret_cast<rocksdb::Options*>(jhandle)->info_log_level);
+      reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->info_log_level);
 }
 
 /*
@@ -994,10 +1007,10 @@ jbyte Java_org_rocksdb_Options_infoLogLevel(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    tableCacheNumshardbits
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_tableCacheNumshardbits(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->table_cache_numshardbits;
+jint Java_org_rocksdb_Options_tableCacheNumshardbits(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->table_cache_numshardbits;
 }
 
 /*
@@ -1006,10 +1019,9 @@ jint Java_org_rocksdb_Options_tableCacheNumshardbits(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setTableCacheNumshardbits(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint table_cache_numshardbits) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->table_cache_numshardbits =
-      static_cast<int>(table_cache_numshardbits);
+    JNIEnv*, jobject, jlong jhandle, jint table_cache_numshardbits) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->table_cache_numshardbits = static_cast<int>(table_cache_numshardbits);
 }
 
 /*
@@ -1017,21 +1029,21 @@ void Java_org_rocksdb_Options_setTableCacheNumshardbits(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_useFixedLengthPrefixExtractor(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint jprefix_length) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->prefix_extractor.reset(
-      rocksdb::NewFixedPrefixTransform(static_cast<int>(jprefix_length)));
+    JNIEnv*, jobject, jlong jhandle, jint jprefix_length) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->prefix_extractor.reset(ROCKSDB_NAMESPACE::NewFixedPrefixTransform(
+          static_cast<int>(jprefix_length)));
 }
 
 /*
  * Method:    useCappedPrefixExtractor
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_useCappedPrefixExtractor(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle,
-                                                       jint jprefix_length) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->prefix_extractor.reset(
-      rocksdb::NewCappedPrefixTransform(static_cast<int>(jprefix_length)));
+void Java_org_rocksdb_Options_useCappedPrefixExtractor(
+    JNIEnv*, jobject, jlong jhandle, jint jprefix_length) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->prefix_extractor.reset(ROCKSDB_NAMESPACE::NewCappedPrefixTransform(
+          static_cast<int>(jprefix_length)));
 }
 
 /*
@@ -1039,9 +1051,10 @@ void Java_org_rocksdb_Options_useCappedPrefixExtractor(JNIEnv* /*env*/,
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_walTtlSeconds(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->WAL_ttl_seconds;
+jlong Java_org_rocksdb_Options_walTtlSeconds(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->WAL_ttl_seconds;
 }
 
 /*
@@ -1049,10 +1062,9 @@ jlong Java_org_rocksdb_Options_walTtlSeconds(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setWalTtlSeconds
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWalTtlSeconds(JNIEnv* /*env*/,
-                                               jobject /*jobj*/, jlong jhandle,
-                                               jlong WAL_ttl_seconds) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->WAL_ttl_seconds =
+void Java_org_rocksdb_Options_setWalTtlSeconds(
+    JNIEnv*, jobject, jlong jhandle, jlong WAL_ttl_seconds) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->WAL_ttl_seconds =
       static_cast<int64_t>(WAL_ttl_seconds);
 }
 
@@ -1061,9 +1073,10 @@ void Java_org_rocksdb_Options_setWalTtlSeconds(JNIEnv* /*env*/,
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_walSizeLimitMB(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->WAL_size_limit_MB;
+jlong Java_org_rocksdb_Options_walSizeLimitMB(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->WAL_size_limit_MB;
 }
 
 /*
@@ -1071,10 +1084,9 @@ jlong Java_org_rocksdb_Options_walSizeLimitMB(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setWalSizeLimitMB
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWalSizeLimitMB(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jlong WAL_size_limit_MB) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->WAL_size_limit_MB =
+void Java_org_rocksdb_Options_setWalSizeLimitMB(
+    JNIEnv*, jobject, jlong jhandle, jlong WAL_size_limit_MB) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->WAL_size_limit_MB =
       static_cast<int64_t>(WAL_size_limit_MB);
 }
 
@@ -1083,10 +1095,9 @@ void Java_org_rocksdb_Options_setWalSizeLimitMB(JNIEnv* /*env*/,
  * Method:    manifestPreallocationSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_manifestPreallocationSize(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_manifestPreallocationSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->manifest_preallocation_size;
 }
 
@@ -1096,13 +1107,14 @@ jlong Java_org_rocksdb_Options_manifestPreallocationSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setManifestPreallocationSize(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle, jlong preallocation_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(preallocation_size);
+    JNIEnv* env, jobject, jlong jhandle, jlong preallocation_size) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      preallocation_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->manifest_preallocation_size =
-        preallocation_size;
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+        ->manifest_preallocation_size = preallocation_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -1110,11 +1122,12 @@ void Java_org_rocksdb_Options_setManifestPreallocationSize(
  * Method:    setTableFactory
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setTableFactory(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle,
-                                              jlong jfactory_handle) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->table_factory.reset(
-      reinterpret_cast<rocksdb::TableFactory*>(jfactory_handle));
+void Java_org_rocksdb_Options_setTableFactory(
+    JNIEnv*, jobject, jlong jhandle, jlong jtable_factory_handle) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  auto* table_factory =
+      reinterpret_cast<ROCKSDB_NAMESPACE::TableFactory*>(jtable_factory_handle);
+  options->table_factory.reset(table_factory);
 }
 
 /*
@@ -1122,10 +1135,10 @@ void Java_org_rocksdb_Options_setTableFactory(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    allowMmapReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowMmapReads(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->allow_mmap_reads;
+jboolean Java_org_rocksdb_Options_allowMmapReads(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->allow_mmap_reads;
 }
 
 /*
@@ -1133,10 +1146,9 @@ jboolean Java_org_rocksdb_Options_allowMmapReads(JNIEnv* /*env*/,
  * Method:    setAllowMmapReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowMmapReads(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jboolean allow_mmap_reads) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->allow_mmap_reads =
+void Java_org_rocksdb_Options_setAllowMmapReads(
+    JNIEnv*, jobject, jlong jhandle, jboolean allow_mmap_reads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->allow_mmap_reads =
       static_cast<bool>(allow_mmap_reads);
 }
 
@@ -1145,10 +1157,10 @@ void Java_org_rocksdb_Options_setAllowMmapReads(JNIEnv* /*env*/,
  * Method:    allowMmapWrites
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowMmapWrites(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->allow_mmap_writes;
+jboolean Java_org_rocksdb_Options_allowMmapWrites(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->allow_mmap_writes;
 }
 
 /*
@@ -1156,11 +1168,9 @@ jboolean Java_org_rocksdb_Options_allowMmapWrites(JNIEnv* /*env*/,
  * Method:    setAllowMmapWrites
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowMmapWrites(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jboolean allow_mmap_writes) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->allow_mmap_writes =
+void Java_org_rocksdb_Options_setAllowMmapWrites(
+    JNIEnv*, jobject, jlong jhandle, jboolean allow_mmap_writes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->allow_mmap_writes =
       static_cast<bool>(allow_mmap_writes);
 }
 
@@ -1169,10 +1179,10 @@ void Java_org_rocksdb_Options_setAllowMmapWrites(JNIEnv* /*env*/,
  * Method:    useDirectReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_useDirectReads(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->use_direct_reads;
+jboolean Java_org_rocksdb_Options_useDirectReads(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->use_direct_reads;
 }
 
 /*
@@ -1180,10 +1190,9 @@ jboolean Java_org_rocksdb_Options_useDirectReads(JNIEnv* /*env*/,
  * Method:    setUseDirectReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUseDirectReads(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jboolean use_direct_reads) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->use_direct_reads =
+void Java_org_rocksdb_Options_setUseDirectReads(
+    JNIEnv*, jobject, jlong jhandle, jboolean use_direct_reads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->use_direct_reads =
       static_cast<bool>(use_direct_reads);
 }
 
@@ -1193,8 +1202,8 @@ void Java_org_rocksdb_Options_setUseDirectReads(JNIEnv* /*env*/,
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_Options_useDirectIoForFlushAndCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->use_direct_io_for_flush_and_compaction;
 }
 
@@ -1204,9 +1213,9 @@ jboolean Java_org_rocksdb_Options_useDirectIoForFlushAndCompaction(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setUseDirectIoForFlushAndCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean use_direct_io_for_flush_and_compaction) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->use_direct_io_for_flush_and_compaction =
       static_cast<bool>(use_direct_io_for_flush_and_compaction);
 }
@@ -1216,10 +1225,9 @@ void Java_org_rocksdb_Options_setUseDirectIoForFlushAndCompaction(
  * Method:    setAllowFAllocate
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowFAllocate(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jboolean jallow_fallocate) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->allow_fallocate =
+void Java_org_rocksdb_Options_setAllowFAllocate(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_fallocate) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->allow_fallocate =
       static_cast<bool>(jallow_fallocate);
 }
 
@@ -1228,10 +1236,9 @@ void Java_org_rocksdb_Options_setAllowFAllocate(JNIEnv* /*env*/,
  * Method:    allowFAllocate
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowFAllocate(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_allowFAllocate(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->allow_fallocate);
 }
 
@@ -1240,10 +1247,10 @@ jboolean Java_org_rocksdb_Options_allowFAllocate(JNIEnv* /*env*/,
  * Method:    isFdCloseOnExec
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_isFdCloseOnExec(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->is_fd_close_on_exec;
+jboolean Java_org_rocksdb_Options_isFdCloseOnExec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->is_fd_close_on_exec;
 }
 
 /*
@@ -1251,11 +1258,9 @@ jboolean Java_org_rocksdb_Options_isFdCloseOnExec(JNIEnv* /*env*/,
  * Method:    setIsFdCloseOnExec
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setIsFdCloseOnExec(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jboolean is_fd_close_on_exec) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->is_fd_close_on_exec =
+void Java_org_rocksdb_Options_setIsFdCloseOnExec(
+    JNIEnv*, jobject, jlong jhandle, jboolean is_fd_close_on_exec) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->is_fd_close_on_exec =
       static_cast<bool>(is_fd_close_on_exec);
 }
 
@@ -1264,10 +1269,10 @@ void Java_org_rocksdb_Options_setIsFdCloseOnExec(JNIEnv* /*env*/,
  * Method:    statsDumpPeriodSec
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_statsDumpPeriodSec(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->stats_dump_period_sec;
+jint Java_org_rocksdb_Options_statsDumpPeriodSec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->stats_dump_period_sec;
 }
 
 /*
@@ -1276,10 +1281,57 @@ jint Java_org_rocksdb_Options_statsDumpPeriodSec(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setStatsDumpPeriodSec(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint stats_dump_period_sec) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->stats_dump_period_sec =
-      static_cast<int>(stats_dump_period_sec);
+    JNIEnv*, jobject, jlong jhandle,
+    jint jstats_dump_period_sec) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->stats_dump_period_sec =
+      static_cast<unsigned int>(jstats_dump_period_sec);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    statsPersistPeriodSec
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_Options_statsPersistPeriodSec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->stats_persist_period_sec;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setStatsPersistPeriodSec
+ * Signature: (JI)V
+ */
+void Java_org_rocksdb_Options_setStatsPersistPeriodSec(
+    JNIEnv*, jobject, jlong jhandle, jint jstats_persist_period_sec) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->stats_persist_period_sec =
+      static_cast<unsigned int>(jstats_persist_period_sec);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    statsHistoryBufferSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_statsHistoryBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->stats_history_buffer_size;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setStatsHistoryBufferSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setStatsHistoryBufferSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jstats_history_buffer_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->stats_history_buffer_size =
+      static_cast<size_t>(jstats_history_buffer_size);
 }
 
 /*
@@ -1287,10 +1339,10 @@ void Java_org_rocksdb_Options_setStatsDumpPeriodSec(
  * Method:    adviseRandomOnOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_adviseRandomOnOpen(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->advise_random_on_open;
+jboolean Java_org_rocksdb_Options_adviseRandomOnOpen(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->advise_random_on_open;
 }
 
 /*
@@ -1299,10 +1351,10 @@ jboolean Java_org_rocksdb_Options_adviseRandomOnOpen(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setAdviseRandomOnOpen(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean advise_random_on_open) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->advise_random_on_open =
-      static_cast<bool>(advise_random_on_open);
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->advise_random_on_open = static_cast<bool>(advise_random_on_open);
 }
 
 /*
@@ -1311,9 +1363,9 @@ void Java_org_rocksdb_Options_setAdviseRandomOnOpen(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setDbWriteBufferSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jdb_write_buffer_size) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->db_write_buffer_size = static_cast<size_t>(jdb_write_buffer_size);
 }
 
@@ -1322,10 +1374,9 @@ void Java_org_rocksdb_Options_setDbWriteBufferSize(
  * Method:    dbWriteBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_dbWriteBufferSize(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_dbWriteBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->db_write_buffer_size);
 }
 
@@ -1335,11 +1386,11 @@ jlong Java_org_rocksdb_Options_dbWriteBufferSize(JNIEnv* /*env*/,
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setAccessHintOnCompactionStart(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jbyte jaccess_hint_value) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->access_hint_on_compaction_start =
-      rocksdb::AccessHintJni::toCppAccessHint(jaccess_hint_value);
+      ROCKSDB_NAMESPACE::AccessHintJni::toCppAccessHint(jaccess_hint_value);
 }
 
 /*
@@ -1347,11 +1398,10 @@ void Java_org_rocksdb_Options_setAccessHintOnCompactionStart(
  * Method:    accessHintOnCompactionStart
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_accessHintOnCompactionStart(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  return rocksdb::AccessHintJni::toJavaAccessHint(
+jbyte Java_org_rocksdb_Options_accessHintOnCompactionStart(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::AccessHintJni::toJavaAccessHint(
       opt->access_hint_on_compaction_start);
 }
 
@@ -1361,9 +1411,9 @@ jbyte Java_org_rocksdb_Options_accessHintOnCompactionStart(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setNewTableReaderForCompactionInputs(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean jnew_table_reader_for_compaction_inputs) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->new_table_reader_for_compaction_inputs =
       static_cast<bool>(jnew_table_reader_for_compaction_inputs);
 }
@@ -1374,8 +1424,8 @@ void Java_org_rocksdb_Options_setNewTableReaderForCompactionInputs(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_Options_newTableReaderForCompactionInputs(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<bool>(opt->new_table_reader_for_compaction_inputs);
 }
 
@@ -1385,9 +1435,9 @@ jboolean Java_org_rocksdb_Options_newTableReaderForCompactionInputs(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setCompactionReadaheadSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jcompaction_readahead_size) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->compaction_readahead_size =
       static_cast<size_t>(jcompaction_readahead_size);
 }
@@ -1397,10 +1447,9 @@ void Java_org_rocksdb_Options_setCompactionReadaheadSize(
  * Method:    compactionReadaheadSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_compactionReadaheadSize(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_compactionReadaheadSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->compaction_readahead_size);
 }
 
@@ -1410,9 +1459,8 @@ jlong Java_org_rocksdb_Options_compactionReadaheadSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setRandomAccessMaxBufferSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jrandom_access_max_buffer_size) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jlong jrandom_access_max_buffer_size) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->random_access_max_buffer_size =
       static_cast<size_t>(jrandom_access_max_buffer_size);
 }
@@ -1422,10 +1470,9 @@ void Java_org_rocksdb_Options_setRandomAccessMaxBufferSize(
  * Method:    randomAccessMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_randomAccessMaxBufferSize(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_randomAccessMaxBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->random_access_max_buffer_size);
 }
 
@@ -1435,9 +1482,9 @@ jlong Java_org_rocksdb_Options_randomAccessMaxBufferSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setWritableFileMaxBufferSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jwritable_file_max_buffer_size) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->writable_file_max_buffer_size =
       static_cast<size_t>(jwritable_file_max_buffer_size);
 }
@@ -1447,10 +1494,9 @@ void Java_org_rocksdb_Options_setWritableFileMaxBufferSize(
  * Method:    writableFileMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writableFileMaxBufferSize(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_writableFileMaxBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->writable_file_max_buffer_size);
 }
 
@@ -1459,10 +1505,10 @@ jlong Java_org_rocksdb_Options_writableFileMaxBufferSize(JNIEnv* /*env*/,
  * Method:    useAdaptiveMutex
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_useAdaptiveMutex(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->use_adaptive_mutex;
+jboolean Java_org_rocksdb_Options_useAdaptiveMutex(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->use_adaptive_mutex;
 }
 
 /*
@@ -1470,11 +1516,9 @@ jboolean Java_org_rocksdb_Options_useAdaptiveMutex(JNIEnv* /*env*/,
  * Method:    setUseAdaptiveMutex
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUseAdaptiveMutex(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jboolean use_adaptive_mutex) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->use_adaptive_mutex =
+void Java_org_rocksdb_Options_setUseAdaptiveMutex(
+    JNIEnv*, jobject, jlong jhandle, jboolean use_adaptive_mutex) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->use_adaptive_mutex =
       static_cast<bool>(use_adaptive_mutex);
 }
 
@@ -1483,9 +1527,9 @@ void Java_org_rocksdb_Options_setUseAdaptiveMutex(JNIEnv* /*env*/,
  * Method:    bytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_bytesPerSync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->bytes_per_sync;
+jlong Java_org_rocksdb_Options_bytesPerSync(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bytes_per_sync;
 }
 
 /*
@@ -1493,10 +1537,9 @@ jlong Java_org_rocksdb_Options_bytesPerSync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setBytesPerSync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle,
-                                              jlong bytes_per_sync) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->bytes_per_sync =
+void Java_org_rocksdb_Options_setBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle, jlong bytes_per_sync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bytes_per_sync =
       static_cast<int64_t>(bytes_per_sync);
 }
 
@@ -1505,11 +1548,9 @@ void Java_org_rocksdb_Options_setBytesPerSync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setWalBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWalBytesPerSync(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jlong jwal_bytes_per_sync) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->wal_bytes_per_sync =
+void Java_org_rocksdb_Options_setWalBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle, jlong jwal_bytes_per_sync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->wal_bytes_per_sync =
       static_cast<int64_t>(jwal_bytes_per_sync);
 }
 
@@ -1518,22 +1559,42 @@ void Java_org_rocksdb_Options_setWalBytesPerSync(JNIEnv* /*env*/,
  * Method:    walBytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_walBytesPerSync(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_walBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->wal_bytes_per_sync);
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setStrictBytesPerSync
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setStrictBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle, jboolean jstrict_bytes_per_sync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->strict_bytes_per_sync = jstrict_bytes_per_sync == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    strictBytesPerSync
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_strictBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->strict_bytes_per_sync);
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setEnableThreadTracking
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setEnableThreadTracking(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jenable_thread_tracking) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_thread_tracking) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->enable_thread_tracking = static_cast<bool>(jenable_thread_tracking);
 }
 
@@ -1542,10 +1603,9 @@ void Java_org_rocksdb_Options_setEnableThreadTracking(
  * Method:    enableThreadTracking
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_enableThreadTracking(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_enableThreadTracking(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->enable_thread_tracking);
 }
 
@@ -1554,11 +1614,9 @@ jboolean Java_org_rocksdb_Options_enableThreadTracking(JNIEnv* /*env*/,
  * Method:    setDelayedWriteRate
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setDelayedWriteRate(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jlong jdelayed_write_rate) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+void Java_org_rocksdb_Options_setDelayedWriteRate(
+    JNIEnv*, jobject, jlong jhandle, jlong jdelayed_write_rate) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->delayed_write_rate = static_cast<uint64_t>(jdelayed_write_rate);
 }
 
@@ -1567,23 +1625,64 @@ void Java_org_rocksdb_Options_setDelayedWriteRate(JNIEnv* /*env*/,
  * Method:    delayedWriteRate
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_delayedWriteRate(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jlong Java_org_rocksdb_Options_delayedWriteRate(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jlong>(opt->delayed_write_rate);
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setEnablePipelinedWrite
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setEnablePipelinedWrite(
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_pipelined_write) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->enable_pipelined_write = jenable_pipelined_write == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    enablePipelinedWrite
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_enablePipelinedWrite(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->enable_pipelined_write);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setUnorderedWrite
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setUnorderedWrite(
+    JNIEnv*, jobject, jlong jhandle, jboolean unordered_write) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->unordered_write =
+      static_cast<bool>(unordered_write);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    unorderedWrite
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_unorderedWrite(
+        JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->unordered_write;
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setAllowConcurrentMemtableWrite
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowConcurrentMemtableWrite(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle,
-                                                              jboolean allow) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+void Java_org_rocksdb_Options_setAllowConcurrentMemtableWrite(
+    JNIEnv*, jobject, jlong jhandle, jboolean allow) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->allow_concurrent_memtable_write = static_cast<bool>(allow);
 }
 
@@ -1592,10 +1691,9 @@ void Java_org_rocksdb_Options_setAllowConcurrentMemtableWrite(JNIEnv* /*env*/,
  * Method:    allowConcurrentMemtableWrite
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowConcurrentMemtableWrite(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jboolean Java_org_rocksdb_Options_allowConcurrentMemtableWrite(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->allow_concurrent_memtable_write;
 }
 
@@ -1605,8 +1703,8 @@ jboolean Java_org_rocksdb_Options_allowConcurrentMemtableWrite(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setEnableWriteThreadAdaptiveYield(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jboolean yield) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean yield) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->enable_write_thread_adaptive_yield = static_cast<bool>(yield);
 }
 
@@ -1616,8 +1714,8 @@ void Java_org_rocksdb_Options_setEnableWriteThreadAdaptiveYield(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_Options_enableWriteThreadAdaptiveYield(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->enable_write_thread_adaptive_yield;
 }
 
@@ -1626,12 +1724,10 @@ jboolean Java_org_rocksdb_Options_enableWriteThreadAdaptiveYield(
  * Method:    setWriteThreadMaxYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWriteThreadMaxYieldUsec(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle,
-                                                         jlong max) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->write_thread_max_yield_usec =
-      static_cast<int64_t>(max);
+void Java_org_rocksdb_Options_setWriteThreadMaxYieldUsec(
+    JNIEnv*, jobject, jlong jhandle, jlong max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->write_thread_max_yield_usec = static_cast<int64_t>(max);
 }
 
 /*
@@ -1639,10 +1735,9 @@ void Java_org_rocksdb_Options_setWriteThreadMaxYieldUsec(JNIEnv* /*env*/,
  * Method:    writeThreadMaxYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writeThreadMaxYieldUsec(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_writeThreadMaxYieldUsec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->write_thread_max_yield_usec;
 }
 
@@ -1651,12 +1746,10 @@ jlong Java_org_rocksdb_Options_writeThreadMaxYieldUsec(JNIEnv* /*env*/,
  * Method:    setWriteThreadSlowYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWriteThreadSlowYieldUsec(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle,
-                                                          jlong slow) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->write_thread_slow_yield_usec =
-      static_cast<int64_t>(slow);
+void Java_org_rocksdb_Options_setWriteThreadSlowYieldUsec(
+    JNIEnv*, jobject, jlong jhandle, jlong slow) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->write_thread_slow_yield_usec = static_cast<int64_t>(slow);
 }
 
 /*
@@ -1664,10 +1757,9 @@ void Java_org_rocksdb_Options_setWriteThreadSlowYieldUsec(JNIEnv* /*env*/,
  * Method:    writeThreadSlowYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writeThreadSlowYieldUsec(JNIEnv* /*env*/,
-                                                        jobject /*jobj*/,
-                                                        jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_writeThreadSlowYieldUsec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->write_thread_slow_yield_usec;
 }
 
@@ -1677,9 +1769,9 @@ jlong Java_org_rocksdb_Options_writeThreadSlowYieldUsec(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setSkipStatsUpdateOnDbOpen(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean jskip_stats_update_on_db_open) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->skip_stats_update_on_db_open =
       static_cast<bool>(jskip_stats_update_on_db_open);
 }
@@ -1689,24 +1781,48 @@ void Java_org_rocksdb_Options_setSkipStatsUpdateOnDbOpen(
  * Method:    skipStatsUpdateOnDbOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_skipStatsUpdateOnDbOpen(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_skipStatsUpdateOnDbOpen(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->skip_stats_update_on_db_open);
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setSkipCheckingSstFileSizesOnDbOpen
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setSkipCheckingSstFileSizesOnDbOpen(
+    JNIEnv*, jobject, jlong jhandle,
+    jboolean jskip_checking_sst_file_sizes_on_db_open) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->skip_checking_sst_file_sizes_on_db_open =
+      static_cast<bool>(jskip_checking_sst_file_sizes_on_db_open);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    skipCheckingSstFileSizesOnDbOpen
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_skipCheckingSstFileSizesOnDbOpen(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->skip_checking_sst_file_sizes_on_db_open);
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setWalRecoveryMode
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setWalRecoveryMode(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jbyte jwal_recovery_mode_value) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  opt->wal_recovery_mode = rocksdb::WALRecoveryModeJni::toCppWALRecoveryMode(
-      jwal_recovery_mode_value);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->wal_recovery_mode =
+      ROCKSDB_NAMESPACE::WALRecoveryModeJni::toCppWALRecoveryMode(
+          jwal_recovery_mode_value);
 }
 
 /*
@@ -1714,11 +1830,10 @@ void Java_org_rocksdb_Options_setWalRecoveryMode(
  * Method:    walRecoveryMode
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_walRecoveryMode(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  return rocksdb::WALRecoveryModeJni::toJavaWALRecoveryMode(
+jbyte Java_org_rocksdb_Options_walRecoveryMode(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::WALRecoveryModeJni::toJavaWALRecoveryMode(
       opt->wal_recovery_mode);
 }
 
@@ -1727,9 +1842,9 @@ jbyte Java_org_rocksdb_Options_walRecoveryMode(JNIEnv* /*env*/,
  * Method:    setAllow2pc
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
-                                          jlong jhandle, jboolean jallow_2pc) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+void Java_org_rocksdb_Options_setAllow2pc(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_2pc) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->allow_2pc = static_cast<bool>(jallow_2pc);
 }
 
@@ -1738,9 +1853,9 @@ void Java_org_rocksdb_Options_setAllow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    allow2pc
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
-                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_allow2pc(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->allow_2pc);
 }
 
@@ -1749,24 +1864,37 @@ jboolean Java_org_rocksdb_Options_allow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setRowCache
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setRowCache(JNIEnv* /*env*/, jobject /*jobj*/,
-                                          jlong jhandle,
-                                          jlong jrow_cache_handle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+void Java_org_rocksdb_Options_setRowCache(
+    JNIEnv*, jobject, jlong jhandle, jlong jrow_cache_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   auto* row_cache =
-      reinterpret_cast<std::shared_ptr<rocksdb::Cache>*>(jrow_cache_handle);
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::Cache>*>(
+          jrow_cache_handle);
   opt->row_cache = *row_cache;
 }
 
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setWalFilter
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setWalFilter(
+    JNIEnv*, jobject, jlong jhandle, jlong jwal_filter_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  auto* wal_filter = reinterpret_cast<ROCKSDB_NAMESPACE::WalFilterJniCallback*>(
+      jwal_filter_handle);
+  opt->wal_filter = wal_filter;
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setFailIfOptionsFileError
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setFailIfOptionsFileError(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jfail_if_options_file_error) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jfail_if_options_file_error) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->fail_if_options_file_error =
       static_cast<bool>(jfail_if_options_file_error);
 }
@@ -1776,10 +1904,9 @@ void Java_org_rocksdb_Options_setFailIfOptionsFileError(
  * Method:    failIfOptionsFileError
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_failIfOptionsFileError(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_failIfOptionsFileError(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->fail_if_options_file_error);
 }
 
@@ -1788,11 +1915,9 @@ jboolean Java_org_rocksdb_Options_failIfOptionsFileError(JNIEnv* /*env*/,
  * Method:    setDumpMallocStats
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setDumpMallocStats(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jboolean jdump_malloc_stats) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+void Java_org_rocksdb_Options_setDumpMallocStats(
+    JNIEnv*, jobject, jlong jhandle, jboolean jdump_malloc_stats) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->dump_malloc_stats = static_cast<bool>(jdump_malloc_stats);
 }
 
@@ -1801,10 +1926,9 @@ void Java_org_rocksdb_Options_setDumpMallocStats(JNIEnv* /*env*/,
  * Method:    dumpMallocStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_dumpMallocStats(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_dumpMallocStats(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->dump_malloc_stats);
 }
 
@@ -1814,9 +1938,8 @@ jboolean Java_org_rocksdb_Options_dumpMallocStats(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setAvoidFlushDuringRecovery(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean javoid_flush_during_recovery) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean javoid_flush_during_recovery) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->avoid_flush_during_recovery =
       static_cast<bool>(javoid_flush_during_recovery);
 }
@@ -1826,10 +1949,9 @@ void Java_org_rocksdb_Options_setAvoidFlushDuringRecovery(
  * Method:    avoidFlushDuringRecovery
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_avoidFlushDuringRecovery(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_avoidFlushDuringRecovery(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->avoid_flush_during_recovery);
 }
 
@@ -1839,9 +1961,8 @@ jboolean Java_org_rocksdb_Options_avoidFlushDuringRecovery(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setAvoidFlushDuringShutdown(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean javoid_flush_during_shutdown) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean javoid_flush_during_shutdown) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->avoid_flush_during_shutdown =
       static_cast<bool>(javoid_flush_during_shutdown);
 }
@@ -1851,21 +1972,130 @@ void Java_org_rocksdb_Options_setAvoidFlushDuringShutdown(
  * Method:    avoidFlushDuringShutdown
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_avoidFlushDuringShutdown(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_avoidFlushDuringShutdown(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<jboolean>(opt->avoid_flush_during_shutdown);
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setAllowIngestBehind
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setAllowIngestBehind(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_ingest_behind) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->allow_ingest_behind = jallow_ingest_behind == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    allowIngestBehind
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_allowIngestBehind(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->allow_ingest_behind);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setPreserveDeletes
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setPreserveDeletes(
+    JNIEnv*, jobject, jlong jhandle, jboolean jpreserve_deletes) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->preserve_deletes = jpreserve_deletes == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    preserveDeletes
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_preserveDeletes(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->preserve_deletes);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setTwoWriteQueues
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setTwoWriteQueues(
+    JNIEnv*, jobject, jlong jhandle, jboolean jtwo_write_queues) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->two_write_queues = jtwo_write_queues == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    twoWriteQueues
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_twoWriteQueues(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->two_write_queues);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setManualWalFlush
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setManualWalFlush(
+    JNIEnv*, jobject, jlong jhandle, jboolean jmanual_wal_flush) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->manual_wal_flush = jmanual_wal_flush == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    manualWalFlush
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_manualWalFlush(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->manual_wal_flush);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setAtomicFlush
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setAtomicFlush(
+    JNIEnv*, jobject, jlong jhandle, jboolean jatomic_flush) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opt->atomic_flush = jatomic_flush == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    atomicFlush
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_atomicFlush(
+    JNIEnv *, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opt->atomic_flush);
+}
+
 /*
  * Method:    tableFactoryName
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_tableFactoryName(JNIEnv* env, jobject /*jobj*/,
-                                                  jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
-  rocksdb::TableFactory* tf = opt->table_factory.get();
+jstring Java_org_rocksdb_Options_tableFactoryName(
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  ROCKSDB_NAMESPACE::TableFactory* tf = opt->table_factory.get();
 
   // Should never be nullptr.
   // Default memtable factory is SkipListFactory
@@ -1879,10 +2109,9 @@ jstring Java_org_rocksdb_Options_tableFactoryName(JNIEnv* env, jobject /*jobj*/,
  * Method:    minWriteBufferNumberToMerge
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_minWriteBufferNumberToMerge(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_minWriteBufferNumberToMerge(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->min_write_buffer_number_to_merge;
 }
 
@@ -1892,9 +2121,8 @@ jint Java_org_rocksdb_Options_minWriteBufferNumberToMerge(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMinWriteBufferNumberToMerge(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jmin_write_buffer_number_to_merge) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jmin_write_buffer_number_to_merge) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->min_write_buffer_number_to_merge =
       static_cast<int>(jmin_write_buffer_number_to_merge);
 }
@@ -1903,10 +2131,9 @@ void Java_org_rocksdb_Options_setMinWriteBufferNumberToMerge(
  * Method:    maxWriteBufferNumberToMaintain
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxWriteBufferNumberToMaintain(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_maxWriteBufferNumberToMaintain(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_write_buffer_number_to_maintain;
 }
 
@@ -1916,9 +2143,9 @@ jint Java_org_rocksdb_Options_maxWriteBufferNumberToMaintain(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMaxWriteBufferNumberToMaintain(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jmax_write_buffer_number_to_maintain) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_write_buffer_number_to_maintain =
       static_cast<int>(jmax_write_buffer_number_to_maintain);
 }
@@ -1929,11 +2156,11 @@ void Java_org_rocksdb_Options_setMaxWriteBufferNumberToMaintain(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setCompressionType(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jcompression_type_value) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
-  opts->compression = rocksdb::CompressionTypeJni::toCppCompressionType(
-      jcompression_type_value);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompression_type_value) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->compression =
+      ROCKSDB_NAMESPACE::CompressionTypeJni::toCppCompressionType(
+          jcompression_type_value);
 }
 
 /*
@@ -1941,41 +2168,43 @@ void Java_org_rocksdb_Options_setCompressionType(
  * Method:    compressionType
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_compressionType(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
-  return rocksdb::CompressionTypeJni::toJavaCompressionType(opts->compression);
+jbyte Java_org_rocksdb_Options_compressionType(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
+      opts->compression);
 }
 
 /**
  * Helper method to convert a Java byte array of compression levels
- * to a C++ vector of rocksdb::CompressionType
+ * to a C++ vector of ROCKSDB_NAMESPACE::CompressionType
  *
  * @param env A pointer to the Java environment
  * @param jcompression_levels A reference to a java byte array
  *     where each byte indicates a compression level
  *
- * @return A unique_ptr to the vector, or unique_ptr(nullptr) if a JNI exception
- * occurs
+ * @return A std::unique_ptr to the vector, or std::unique_ptr(nullptr) if a JNI
+ * exception occurs
  */
-std::unique_ptr<std::vector<rocksdb::CompressionType>>
+std::unique_ptr<std::vector<ROCKSDB_NAMESPACE::CompressionType>>
 rocksdb_compression_vector_helper(JNIEnv* env, jbyteArray jcompression_levels) {
   jsize len = env->GetArrayLength(jcompression_levels);
   jbyte* jcompression_level =
       env->GetByteArrayElements(jcompression_levels, nullptr);
   if (jcompression_level == nullptr) {
     // exception thrown: OutOfMemoryError
-    return std::unique_ptr<std::vector<rocksdb::CompressionType>>();
+    return std::unique_ptr<std::vector<ROCKSDB_NAMESPACE::CompressionType>>();
   }
 
-  auto* compression_levels = new std::vector<rocksdb::CompressionType>();
-  std::unique_ptr<std::vector<rocksdb::CompressionType>>
+  auto* compression_levels =
+      new std::vector<ROCKSDB_NAMESPACE::CompressionType>();
+  std::unique_ptr<std::vector<ROCKSDB_NAMESPACE::CompressionType>>
       uptr_compression_levels(compression_levels);
 
   for (jsize i = 0; i < len; i++) {
     jbyte jcl = jcompression_level[i];
-    compression_levels->push_back(static_cast<rocksdb::CompressionType>(jcl));
+    compression_levels->push_back(
+        static_cast<ROCKSDB_NAMESPACE::CompressionType>(jcl));
   }
 
   env->ReleaseByteArrayElements(jcompression_levels, jcompression_level,
@@ -1985,7 +2214,7 @@ rocksdb_compression_vector_helper(JNIEnv* env, jbyteArray jcompression_levels) {
 }
 
 /**
- * Helper method to convert a C++ vector of rocksdb::CompressionType
+ * Helper method to convert a C++ vector of ROCKSDB_NAMESPACE::CompressionType
  * to a Java byte array of compression levels
  *
  * @param env A pointer to the Java environment
@@ -1995,7 +2224,8 @@ rocksdb_compression_vector_helper(JNIEnv* env, jbyteArray jcompression_levels) {
  * @return A jbytearray or nullptr if an exception occurs
  */
 jbyteArray rocksdb_compression_list_helper(
-    JNIEnv* env, std::vector<rocksdb::CompressionType> compression_levels) {
+    JNIEnv* env,
+    std::vector<ROCKSDB_NAMESPACE::CompressionType> compression_levels) {
   const size_t len = compression_levels.size();
   jbyte* jbuf = new jbyte[len];
 
@@ -2030,15 +2260,14 @@ jbyteArray rocksdb_compression_list_helper(
  * Signature: (J[B)V
  */
 void Java_org_rocksdb_Options_setCompressionPerLevel(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jbyteArray jcompressionLevels) {
+    JNIEnv* env, jobject, jlong jhandle, jbyteArray jcompressionLevels) {
   auto uptr_compression_levels =
       rocksdb_compression_vector_helper(env, jcompressionLevels);
   if (!uptr_compression_levels) {
     // exception occurred
     return;
   }
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   options->compression_per_level = *(uptr_compression_levels.get());
 }
 
@@ -2047,10 +2276,9 @@ void Java_org_rocksdb_Options_setCompressionPerLevel(
  * Method:    compressionPerLevel
  * Signature: (J)[B
  */
-jbyteArray Java_org_rocksdb_Options_compressionPerLevel(JNIEnv* env,
-                                                        jobject /*jobj*/,
-                                                        jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
+jbyteArray Java_org_rocksdb_Options_compressionPerLevel(
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return rocksdb_compression_list_helper(env, options->compression_per_level);
 }
 
@@ -2060,11 +2288,10 @@ jbyteArray Java_org_rocksdb_Options_compressionPerLevel(JNIEnv* env,
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setBottommostCompressionType(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jcompression_type_value) {
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompression_type_value) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   options->bottommost_compression =
-      rocksdb::CompressionTypeJni::toCppCompressionType(
+      ROCKSDB_NAMESPACE::CompressionTypeJni::toCppCompressionType(
           jcompression_type_value);
 }
 
@@ -2073,11 +2300,10 @@ void Java_org_rocksdb_Options_setBottommostCompressionType(
  * Method:    bottommostCompressionType
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_bottommostCompressionType(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
-  return rocksdb::CompressionTypeJni::toJavaCompressionType(
+jbyte Java_org_rocksdb_Options_bottommostCompressionType(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
       options->bottommost_compression);
 }
 
@@ -2087,11 +2313,11 @@ jbyte Java_org_rocksdb_Options_bottommostCompressionType(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setBottommostCompressionOptions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jbottommost_compression_options_handle) {
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   auto* bottommost_compression_options =
-      reinterpret_cast<rocksdb::CompressionOptions*>(
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompressionOptions*>(
           jbottommost_compression_options_handle);
   options->bottommost_compression_opts = *bottommost_compression_options;
 }
@@ -2102,11 +2328,11 @@ void Java_org_rocksdb_Options_setBottommostCompressionOptions(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setCompressionOptions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jcompression_options_handle) {
-  auto* options = reinterpret_cast<rocksdb::Options*>(jhandle);
-  auto* compression_options = reinterpret_cast<rocksdb::CompressionOptions*>(
-      jcompression_options_handle);
+    JNIEnv*, jobject, jlong jhandle, jlong jcompression_options_handle) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  auto* compression_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompressionOptions*>(
+          jcompression_options_handle);
   options->compression_opts = *compression_options;
 }
 
@@ -2115,12 +2341,12 @@ void Java_org_rocksdb_Options_setCompressionOptions(
  * Method:    setCompactionStyle
  * Signature: (JB)V
  */
-void Java_org_rocksdb_Options_setCompactionStyle(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jbyte compaction_style) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->compaction_style =
-      static_cast<rocksdb::CompactionStyle>(compaction_style);
+void Java_org_rocksdb_Options_setCompactionStyle(
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompaction_style) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  options->compaction_style =
+      ROCKSDB_NAMESPACE::CompactionStyleJni::toCppCompactionStyle(
+          jcompaction_style);
 }
 
 /*
@@ -2128,10 +2354,11 @@ void Java_org_rocksdb_Options_setCompactionStyle(JNIEnv* /*env*/,
  * Method:    compactionStyle
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_compactionStyle(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->compaction_style;
+jbyte Java_org_rocksdb_Options_compactionStyle(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompactionStyleJni::toJavaCompactionStyle(
+      options->compaction_style);
 }
 
 /*
@@ -2140,9 +2367,8 @@ jbyte Java_org_rocksdb_Options_compactionStyle(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMaxTableFilesSizeFIFO(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_table_files_size) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_table_files_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->compaction_options_fifo.max_table_files_size =
       static_cast<uint64_t>(jmax_table_files_size);
 }
@@ -2152,10 +2378,9 @@ void Java_org_rocksdb_Options_setMaxTableFilesSizeFIFO(
  * Method:    maxTableFilesSizeFIFO
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxTableFilesSizeFIFO(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_maxTableFilesSizeFIFO(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->compaction_options_fifo.max_table_files_size;
 }
 
@@ -2164,9 +2389,9 @@ jlong Java_org_rocksdb_Options_maxTableFilesSizeFIFO(JNIEnv* /*env*/,
  * Method:    numLevels
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_numLevels(JNIEnv* /*env*/, jobject /*jobj*/,
-                                        jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->num_levels;
+jint Java_org_rocksdb_Options_numLevels(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->num_levels;
 }
 
 /*
@@ -2174,9 +2399,9 @@ jint Java_org_rocksdb_Options_numLevels(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setNumLevels
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setNumLevels(JNIEnv* /*env*/, jobject /*jobj*/,
-                                           jlong jhandle, jint jnum_levels) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->num_levels =
+void Java_org_rocksdb_Options_setNumLevels(
+    JNIEnv*, jobject, jlong jhandle, jint jnum_levels) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->num_levels =
       static_cast<int>(jnum_levels);
 }
 
@@ -2186,8 +2411,8 @@ void Java_org_rocksdb_Options_setNumLevels(JNIEnv* /*env*/, jobject /*jobj*/,
  * Signature: (J)I
  */
 jint Java_org_rocksdb_Options_levelZeroFileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger;
 }
 
@@ -2197,9 +2422,9 @@ jint Java_org_rocksdb_Options_levelZeroFileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevelZeroFileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jlevel0_file_num_compaction_trigger) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int>(jlevel0_file_num_compaction_trigger);
 }
@@ -2209,10 +2434,9 @@ void Java_org_rocksdb_Options_setLevelZeroFileNumCompactionTrigger(
  * Method:    levelZeroSlowdownWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_levelZeroSlowdownWritesTrigger(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_levelZeroSlowdownWritesTrigger(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_slowdown_writes_trigger;
 }
 
@@ -2222,9 +2446,9 @@ jint Java_org_rocksdb_Options_levelZeroSlowdownWritesTrigger(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevelZeroSlowdownWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_slowdown_writes_trigger) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->level0_slowdown_writes_trigger =
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_slowdown_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->level0_slowdown_writes_trigger =
       static_cast<int>(jlevel0_slowdown_writes_trigger);
 }
 
@@ -2233,10 +2457,9 @@ void Java_org_rocksdb_Options_setLevelZeroSlowdownWritesTrigger(
  * Method:    levelZeroStopWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_levelZeroStopWritesTrigger(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_levelZeroStopWritesTrigger(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_stop_writes_trigger;
 }
 
@@ -2246,9 +2469,9 @@ jint Java_org_rocksdb_Options_levelZeroStopWritesTrigger(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevelZeroStopWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_stop_writes_trigger) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->level0_stop_writes_trigger =
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_stop_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->level0_stop_writes_trigger =
       static_cast<int>(jlevel0_stop_writes_trigger);
 }
 
@@ -2257,10 +2480,10 @@ void Java_org_rocksdb_Options_setLevelZeroStopWritesTrigger(
  * Method:    targetFileSizeBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_targetFileSizeBase(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->target_file_size_base;
+jlong Java_org_rocksdb_Options_targetFileSizeBase(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->target_file_size_base;
 }
 
 /*
@@ -2269,10 +2492,9 @@ jlong Java_org_rocksdb_Options_targetFileSizeBase(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setTargetFileSizeBase(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jtarget_file_size_base) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->target_file_size_base =
-      static_cast<uint64_t>(jtarget_file_size_base);
+    JNIEnv*, jobject, jlong jhandle, jlong jtarget_file_size_base) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->target_file_size_base = static_cast<uint64_t>(jtarget_file_size_base);
 }
 
 /*
@@ -2280,10 +2502,9 @@ void Java_org_rocksdb_Options_setTargetFileSizeBase(
  * Method:    targetFileSizeMultiplier
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_targetFileSizeMultiplier(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_targetFileSizeMultiplier(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->target_file_size_multiplier;
 }
 
@@ -2293,9 +2514,9 @@ jint Java_org_rocksdb_Options_targetFileSizeMultiplier(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setTargetFileSizeMultiplier(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jtarget_file_size_multiplier) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->target_file_size_multiplier =
+    JNIEnv*, jobject, jlong jhandle, jint jtarget_file_size_multiplier) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->target_file_size_multiplier =
       static_cast<int>(jtarget_file_size_multiplier);
 }
 
@@ -2304,10 +2525,10 @@ void Java_org_rocksdb_Options_setTargetFileSizeMultiplier(
  * Method:    maxBytesForLevelBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxBytesForLevelBase(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_bytes_for_level_base;
+jlong Java_org_rocksdb_Options_maxBytesForLevelBase(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_bytes_for_level_base;
 }
 
 /*
@@ -2316,9 +2537,9 @@ jlong Java_org_rocksdb_Options_maxBytesForLevelBase(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMaxBytesForLevelBase(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_bytes_for_level_base) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_bytes_for_level_base =
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_bytes_for_level_base) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_bytes_for_level_base =
       static_cast<int64_t>(jmax_bytes_for_level_base);
 }
 
@@ -2328,8 +2549,8 @@ void Java_org_rocksdb_Options_setMaxBytesForLevelBase(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_Options_levelCompactionDynamicLevelBytes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level_compaction_dynamic_level_bytes;
 }
 
@@ -2339,9 +2560,8 @@ jboolean Java_org_rocksdb_Options_levelCompactionDynamicLevelBytes(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setLevelCompactionDynamicLevelBytes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jenable_dynamic_level_bytes) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_dynamic_level_bytes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level_compaction_dynamic_level_bytes = (jenable_dynamic_level_bytes);
 }
 
@@ -2350,10 +2570,9 @@ void Java_org_rocksdb_Options_setLevelCompactionDynamicLevelBytes(
  * Method:    maxBytesForLevelMultiplier
  * Signature: (J)D
  */
-jdouble Java_org_rocksdb_Options_maxBytesForLevelMultiplier(JNIEnv* /*env*/,
-                                                            jobject /*jobj*/,
-                                                            jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jdouble Java_org_rocksdb_Options_maxBytesForLevelMultiplier(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_bytes_for_level_multiplier;
 }
 
@@ -2363,9 +2582,9 @@ jdouble Java_org_rocksdb_Options_maxBytesForLevelMultiplier(JNIEnv* /*env*/,
  * Signature: (JD)V
  */
 void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplier(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jdouble jmax_bytes_for_level_multiplier) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_bytes_for_level_multiplier =
+    JNIEnv*, jobject, jlong jhandle, jdouble jmax_bytes_for_level_multiplier) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_bytes_for_level_multiplier =
       static_cast<double>(jmax_bytes_for_level_multiplier);
 }
 
@@ -2374,11 +2593,11 @@ void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplier(
  * Method:    maxCompactionBytes
  * Signature: (J)I
  */
-jlong Java_org_rocksdb_Options_maxCompactionBytes(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxCompactionBytes(
+    JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jlong>(
-      reinterpret_cast<rocksdb::Options*>(jhandle)->max_compaction_bytes);
+      reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+          ->max_compaction_bytes);
 }
 
 /*
@@ -2387,9 +2606,8 @@ jlong Java_org_rocksdb_Options_maxCompactionBytes(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMaxCompactionBytes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_compaction_bytes) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->max_compaction_bytes =
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_compaction_bytes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_compaction_bytes =
       static_cast<uint64_t>(jmax_compaction_bytes);
 }
 
@@ -2398,9 +2616,10 @@ void Java_org_rocksdb_Options_setMaxCompactionBytes(
  * Method:    arenaBlockSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_arenaBlockSize(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->arena_block_size;
+jlong Java_org_rocksdb_Options_arenaBlockSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->arena_block_size;
 }
 
 /*
@@ -2408,15 +2627,15 @@ jlong Java_org_rocksdb_Options_arenaBlockSize(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setArenaBlockSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setArenaBlockSize(JNIEnv* env,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jlong jarena_block_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(jarena_block_size);
+void Java_org_rocksdb_Options_setArenaBlockSize(
+    JNIEnv* env, jobject, jlong jhandle, jlong jarena_block_size) {
+  auto s =
+      ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(jarena_block_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->arena_block_size =
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->arena_block_size =
         jarena_block_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -2425,10 +2644,10 @@ void Java_org_rocksdb_Options_setArenaBlockSize(JNIEnv* env,
  * Method:    disableAutoCompactions
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_disableAutoCompactions(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->disable_auto_compactions;
+jboolean Java_org_rocksdb_Options_disableAutoCompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->disable_auto_compactions;
 }
 
 /*
@@ -2437,10 +2656,9 @@ jboolean Java_org_rocksdb_Options_disableAutoCompactions(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setDisableAutoCompactions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jdisable_auto_compactions) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->disable_auto_compactions =
-      static_cast<bool>(jdisable_auto_compactions);
+    JNIEnv*, jobject, jlong jhandle, jboolean jdisable_auto_compactions) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->disable_auto_compactions = static_cast<bool>(jdisable_auto_compactions);
 }
 
 /*
@@ -2448,10 +2666,9 @@ void Java_org_rocksdb_Options_setDisableAutoCompactions(
  * Method:    maxSequentialSkipInIterations
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxSequentialSkipInIterations(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_maxSequentialSkipInIterations(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_sequential_skip_in_iterations;
 }
 
@@ -2461,9 +2678,9 @@ jlong Java_org_rocksdb_Options_maxSequentialSkipInIterations(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMaxSequentialSkipInIterations(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jmax_sequential_skip_in_iterations) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_sequential_skip_in_iterations =
       static_cast<int64_t>(jmax_sequential_skip_in_iterations);
 }
@@ -2473,10 +2690,10 @@ void Java_org_rocksdb_Options_setMaxSequentialSkipInIterations(
  * Method:    inplaceUpdateSupport
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_inplaceUpdateSupport(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->inplace_update_support;
+jboolean Java_org_rocksdb_Options_inplaceUpdateSupport(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->inplace_update_support;
 }
 
 /*
@@ -2485,10 +2702,9 @@ jboolean Java_org_rocksdb_Options_inplaceUpdateSupport(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setInplaceUpdateSupport(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jinplace_update_support) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->inplace_update_support =
-      static_cast<bool>(jinplace_update_support);
+    JNIEnv*, jobject, jlong jhandle, jboolean jinplace_update_support) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->inplace_update_support = static_cast<bool>(jinplace_update_support);
 }
 
 /*
@@ -2496,10 +2712,10 @@ void Java_org_rocksdb_Options_setInplaceUpdateSupport(
  * Method:    inplaceUpdateNumLocks
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_inplaceUpdateNumLocks(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->inplace_update_num_locks;
+jlong Java_org_rocksdb_Options_inplaceUpdateNumLocks(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->inplace_update_num_locks;
 }
 
 /*
@@ -2508,15 +2724,14 @@ jlong Java_org_rocksdb_Options_inplaceUpdateNumLocks(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setInplaceUpdateNumLocks(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jinplace_update_num_locks) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(jinplace_update_num_locks);
+    JNIEnv* env, jobject, jlong jhandle, jlong jinplace_update_num_locks) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jinplace_update_num_locks);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->inplace_update_num_locks =
-        jinplace_update_num_locks;
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+        ->inplace_update_num_locks = jinplace_update_num_locks;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -2525,10 +2740,9 @@ void Java_org_rocksdb_Options_setInplaceUpdateNumLocks(
  * Method:    memtablePrefixBloomSizeRatio
  * Signature: (J)I
  */
-jdouble Java_org_rocksdb_Options_memtablePrefixBloomSizeRatio(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jdouble Java_org_rocksdb_Options_memtablePrefixBloomSizeRatio(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->memtable_prefix_bloom_size_ratio;
 }
 
@@ -2538,9 +2752,9 @@ jdouble Java_org_rocksdb_Options_memtablePrefixBloomSizeRatio(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMemtablePrefixBloomSizeRatio(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jdouble jmemtable_prefix_bloom_size_ratio) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->memtable_prefix_bloom_size_ratio =
       static_cast<double>(jmemtable_prefix_bloom_size_ratio);
 }
@@ -2550,9 +2764,9 @@ void Java_org_rocksdb_Options_setMemtablePrefixBloomSizeRatio(
  * Method:    bloomLocality
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_bloomLocality(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->bloom_locality;
+jint Java_org_rocksdb_Options_bloomLocality(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bloom_locality;
 }
 
 /*
@@ -2560,10 +2774,9 @@ jint Java_org_rocksdb_Options_bloomLocality(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setBloomLocality
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setBloomLocality(JNIEnv* /*env*/,
-                                               jobject /*jobj*/, jlong jhandle,
-                                               jint jbloom_locality) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->bloom_locality =
+void Java_org_rocksdb_Options_setBloomLocality(
+    JNIEnv*, jobject, jlong jhandle, jint jbloom_locality) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bloom_locality =
       static_cast<int32_t>(jbloom_locality);
 }
 
@@ -2572,10 +2785,10 @@ void Java_org_rocksdb_Options_setBloomLocality(JNIEnv* /*env*/,
  * Method:    maxSuccessiveMerges
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxSuccessiveMerges(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->max_successive_merges;
+jlong Java_org_rocksdb_Options_maxSuccessiveMerges(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_successive_merges;
 }
 
 /*
@@ -2584,15 +2797,14 @@ jlong Java_org_rocksdb_Options_maxSuccessiveMerges(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMaxSuccessiveMerges(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_successive_merges) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(jmax_successive_merges);
+    JNIEnv* env, jobject, jlong jhandle, jlong jmax_successive_merges) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jmax_successive_merges);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->max_successive_merges =
-        jmax_successive_merges;
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+        ->max_successive_merges = jmax_successive_merges;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -2601,10 +2813,9 @@ void Java_org_rocksdb_Options_setMaxSuccessiveMerges(
  * Method:    optimizeFiltersForHits
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_optimizeFiltersForHits(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jboolean Java_org_rocksdb_Options_optimizeFiltersForHits(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->optimize_filters_for_hits;
 }
 
@@ -2614,9 +2825,9 @@ jboolean Java_org_rocksdb_Options_optimizeFiltersForHits(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setOptimizeFiltersForHits(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean joptimize_filters_for_hits) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->optimize_filters_for_hits =
+    JNIEnv*, jobject, jlong jhandle, jboolean joptimize_filters_for_hits) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->optimize_filters_for_hits =
       static_cast<bool>(joptimize_filters_for_hits);
 }
 
@@ -2625,10 +2836,9 @@ void Java_org_rocksdb_Options_setOptimizeFiltersForHits(
  * Method:    optimizeForSmallDb
  * Signature: (J)V
  */
-void Java_org_rocksdb_Options_optimizeForSmallDb(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->OptimizeForSmallDb();
+void Java_org_rocksdb_Options_optimizeForSmallDb(
+    JNIEnv*, jobject, jlong jhandle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->OptimizeForSmallDb();
 }
 
 /*
@@ -2637,10 +2847,9 @@ void Java_org_rocksdb_Options_optimizeForSmallDb(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_optimizeForPointLookup(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong block_cache_size_mb) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->OptimizeForPointLookup(
-      block_cache_size_mb);
+    JNIEnv*, jobject, jlong jhandle, jlong block_cache_size_mb) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->OptimizeForPointLookup(block_cache_size_mb);
 }
 
 /*
@@ -2649,10 +2858,9 @@ void Java_org_rocksdb_Options_optimizeForPointLookup(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_optimizeLevelStyleCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong memtable_memory_budget) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->OptimizeLevelStyleCompaction(
-      memtable_memory_budget);
+    JNIEnv*, jobject, jlong jhandle, jlong memtable_memory_budget) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->OptimizeLevelStyleCompaction(memtable_memory_budget);
 }
 
 /*
@@ -2661,9 +2869,8 @@ void Java_org_rocksdb_Options_optimizeLevelStyleCompaction(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_optimizeUniversalStyleCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong memtable_memory_budget) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong memtable_memory_budget) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->OptimizeUniversalStyleCompaction(memtable_memory_budget);
 }
 
@@ -2672,10 +2879,9 @@ void Java_org_rocksdb_Options_optimizeUniversalStyleCompaction(
  * Method:    prepareForBulkLoad
  * Signature: (J)V
  */
-void Java_org_rocksdb_Options_prepareForBulkLoad(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->PrepareForBulkLoad();
+void Java_org_rocksdb_Options_prepareForBulkLoad(
+    JNIEnv*, jobject, jlong jhandle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->PrepareForBulkLoad();
 }
 
 /*
@@ -2683,10 +2889,10 @@ void Java_org_rocksdb_Options_prepareForBulkLoad(JNIEnv* /*env*/,
  * Method:    memtableHugePageSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_memtableHugePageSize(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->memtable_huge_page_size;
+jlong Java_org_rocksdb_Options_memtableHugePageSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->memtable_huge_page_size;
 }
 
 /*
@@ -2695,15 +2901,14 @@ jlong Java_org_rocksdb_Options_memtableHugePageSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMemtableHugePageSize(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jmemtable_huge_page_size) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(jmemtable_huge_page_size);
+    JNIEnv* env, jobject, jlong jhandle, jlong jmemtable_huge_page_size) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jmemtable_huge_page_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::Options*>(jhandle)->memtable_huge_page_size =
-        jmemtable_huge_page_size;
+    reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+        ->memtable_huge_page_size = jmemtable_huge_page_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -2712,10 +2917,9 @@ void Java_org_rocksdb_Options_setMemtableHugePageSize(
  * Method:    softPendingCompactionBytesLimit
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_softPendingCompactionBytesLimit(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_softPendingCompactionBytesLimit(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->soft_pending_compaction_bytes_limit;
 }
 
@@ -2725,9 +2929,9 @@ jlong Java_org_rocksdb_Options_softPendingCompactionBytesLimit(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setSoftPendingCompactionBytesLimit(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jsoft_pending_compaction_bytes_limit) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->soft_pending_compaction_bytes_limit =
       static_cast<int64_t>(jsoft_pending_compaction_bytes_limit);
 }
@@ -2737,10 +2941,9 @@ void Java_org_rocksdb_Options_setSoftPendingCompactionBytesLimit(
  * Method:    softHardCompactionBytesLimit
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_hardPendingCompactionBytesLimit(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jlong Java_org_rocksdb_Options_hardPendingCompactionBytesLimit(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->hard_pending_compaction_bytes_limit;
 }
 
@@ -2750,9 +2953,9 @@ jlong Java_org_rocksdb_Options_hardPendingCompactionBytesLimit(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setHardPendingCompactionBytesLimit(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jhard_pending_compaction_bytes_limit) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->hard_pending_compaction_bytes_limit =
       static_cast<int64_t>(jhard_pending_compaction_bytes_limit);
 }
@@ -2762,10 +2965,9 @@ void Java_org_rocksdb_Options_setHardPendingCompactionBytesLimit(
  * Method:    level0FileNumCompactionTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_level0FileNumCompactionTrigger(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_level0FileNumCompactionTrigger(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger;
 }
 
@@ -2775,9 +2977,9 @@ jint Java_org_rocksdb_Options_level0FileNumCompactionTrigger(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevel0FileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jlevel0_file_num_compaction_trigger) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int32_t>(jlevel0_file_num_compaction_trigger);
 }
@@ -2787,10 +2989,9 @@ void Java_org_rocksdb_Options_setLevel0FileNumCompactionTrigger(
  * Method:    level0SlowdownWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_level0SlowdownWritesTrigger(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_level0SlowdownWritesTrigger(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_slowdown_writes_trigger;
 }
 
@@ -2800,9 +3001,9 @@ jint Java_org_rocksdb_Options_level0SlowdownWritesTrigger(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevel0SlowdownWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_slowdown_writes_trigger) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->level0_slowdown_writes_trigger =
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_slowdown_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->level0_slowdown_writes_trigger =
       static_cast<int32_t>(jlevel0_slowdown_writes_trigger);
 }
 
@@ -2811,10 +3012,9 @@ void Java_org_rocksdb_Options_setLevel0SlowdownWritesTrigger(
  * Method:    level0StopWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_level0StopWritesTrigger(JNIEnv* /*env*/,
-                                                      jobject /*jobj*/,
-                                                      jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
+jint Java_org_rocksdb_Options_level0StopWritesTrigger(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_stop_writes_trigger;
 }
 
@@ -2824,9 +3024,9 @@ jint Java_org_rocksdb_Options_level0StopWritesTrigger(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevel0StopWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_stop_writes_trigger) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->level0_stop_writes_trigger =
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_stop_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->level0_stop_writes_trigger =
       static_cast<int32_t>(jlevel0_stop_writes_trigger);
 }
 
@@ -2836,8 +3036,8 @@ void Java_org_rocksdb_Options_setLevel0StopWritesTrigger(
  * Signature: (J)[I
  */
 jintArray Java_org_rocksdb_Options_maxBytesForLevelMultiplierAdditional(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle) {
-  auto mbflma = reinterpret_cast<rocksdb::Options*>(jhandle)
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto mbflma = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
                     ->max_bytes_for_level_multiplier_additional;
 
   const size_t size = mbflma.size();
@@ -2874,7 +3074,7 @@ jintArray Java_org_rocksdb_Options_maxBytesForLevelMultiplierAdditional(
  * Signature: (J[I)V
  */
 void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplierAdditional(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
+    JNIEnv* env, jobject, jlong jhandle,
     jintArray jmax_bytes_for_level_multiplier_additional) {
   jsize len = env->GetArrayLength(jmax_bytes_for_level_multiplier_additional);
   jint* additionals = env->GetIntArrayElements(
@@ -2884,7 +3084,7 @@ void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplierAdditional(
     return;
   }
 
-  auto* opt = reinterpret_cast<rocksdb::Options*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->max_bytes_for_level_multiplier_additional.clear();
   for (jsize i = 0; i < len; i++) {
     opt->max_bytes_for_level_multiplier_additional.push_back(
@@ -2900,10 +3100,10 @@ void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplierAdditional(
  * Method:    paranoidFileChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_paranoidFileChecks(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)->paranoid_file_checks;
+jboolean Java_org_rocksdb_Options_paranoidFileChecks(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->paranoid_file_checks;
 }
 
 /*
@@ -2912,9 +3112,8 @@ jboolean Java_org_rocksdb_Options_paranoidFileChecks(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setParanoidFileChecks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jparanoid_file_checks) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->paranoid_file_checks =
+    JNIEnv*, jobject, jlong jhandle, jboolean jparanoid_file_checks) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->paranoid_file_checks =
       static_cast<bool>(jparanoid_file_checks);
 }
 
@@ -2924,11 +3123,10 @@ void Java_org_rocksdb_Options_setParanoidFileChecks(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setCompactionPriority(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jcompaction_priority_value) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompaction_priority_value) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opts->compaction_pri =
-      rocksdb::CompactionPriorityJni::toCppCompactionPriority(
+      ROCKSDB_NAMESPACE::CompactionPriorityJni::toCppCompactionPriority(
           jcompaction_priority_value);
 }
 
@@ -2937,11 +3135,10 @@ void Java_org_rocksdb_Options_setCompactionPriority(
  * Method:    compactionPriority
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_compactionPriority(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
-  return rocksdb::CompactionPriorityJni::toJavaCompactionPriority(
+jbyte Java_org_rocksdb_Options_compactionPriority(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompactionPriorityJni::toJavaCompactionPriority(
       opts->compaction_pri);
 }
 
@@ -2950,11 +3147,9 @@ jbyte Java_org_rocksdb_Options_compactionPriority(JNIEnv* /*env*/,
  * Method:    setReportBgIoStats
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setReportBgIoStats(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jboolean jreport_bg_io_stats) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
+void Java_org_rocksdb_Options_setReportBgIoStats(
+    JNIEnv*, jobject, jlong jhandle, jboolean jreport_bg_io_stats) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opts->report_bg_io_stats = static_cast<bool>(jreport_bg_io_stats);
 }
 
@@ -2963,24 +3158,46 @@ void Java_org_rocksdb_Options_setReportBgIoStats(JNIEnv* /*env*/,
  * Method:    reportBgIoStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_reportBgIoStats(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_reportBgIoStats(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<bool>(opts->report_bg_io_stats);
 }
 
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setTtl
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setTtl(
+    JNIEnv*, jobject, jlong jhandle, jlong jttl) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->ttl = static_cast<uint64_t>(jttl);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    ttl
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_ttl(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jlong>(opts->ttl);
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setCompactionOptionsUniversal
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setCompactionOptionsUniversal(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jcompaction_options_universal_handle) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
-  auto* opts_uni = reinterpret_cast<rocksdb::CompactionOptionsUniversal*>(
-      jcompaction_options_universal_handle);
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  auto* opts_uni =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactionOptionsUniversal*>(
+          jcompaction_options_universal_handle);
   opts->compaction_options_universal = *opts_uni;
 }
 
@@ -2990,10 +3207,9 @@ void Java_org_rocksdb_Options_setCompactionOptionsUniversal(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setCompactionOptionsFIFO(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jcompaction_options_fifo_handle) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
-  auto* opts_fifo = reinterpret_cast<rocksdb::CompactionOptionsFIFO*>(
+    JNIEnv*, jobject, jlong jhandle, jlong jcompaction_options_fifo_handle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  auto* opts_fifo = reinterpret_cast<ROCKSDB_NAMESPACE::CompactionOptionsFIFO*>(
       jcompaction_options_fifo_handle);
   opts->compaction_options_fifo = *opts_fifo;
 }
@@ -3004,9 +3220,8 @@ void Java_org_rocksdb_Options_setCompactionOptionsFIFO(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setForceConsistencyChecks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jforce_consistency_checks) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jforce_consistency_checks) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opts->force_consistency_checks = static_cast<bool>(jforce_consistency_checks);
 }
 
@@ -3015,15 +3230,14 @@ void Java_org_rocksdb_Options_setForceConsistencyChecks(
  * Method:    forceConsistencyChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_forceConsistencyChecks(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::Options*>(jhandle);
+jboolean Java_org_rocksdb_Options_forceConsistencyChecks(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   return static_cast<bool>(opts->force_consistency_checks);
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// rocksdb::ColumnFamilyOptions
+// ROCKSDB_NAMESPACE::ColumnFamilyOptions
 
 /*
  * Class:     org_rocksdb_ColumnFamilyOptions
@@ -3031,8 +3245,8 @@ jboolean Java_org_rocksdb_Options_forceConsistencyChecks(JNIEnv* /*env*/,
  * Signature: ()J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_newColumnFamilyOptions(
-    JNIEnv* /*env*/, jclass /*jcls*/) {
-  auto* op = new rocksdb::ColumnFamilyOptions();
+    JNIEnv*, jclass) {
+  auto* op = new ROCKSDB_NAMESPACE::ColumnFamilyOptions();
   return reinterpret_cast<jlong>(op);
 }
 
@@ -3042,9 +3256,21 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_newColumnFamilyOptions(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_copyColumnFamilyOptions(
-    JNIEnv* /*env*/, jclass /*jcls*/, jlong jhandle) {
-  auto new_opt = new rocksdb::ColumnFamilyOptions(
-      *(reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)));
+    JNIEnv*, jclass, jlong jhandle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::ColumnFamilyOptions(
+      *(reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)));
+  return reinterpret_cast<jlong>(new_opt);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    newColumnFamilyOptionsFromOptions
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ColumnFamilyOptions_newColumnFamilyOptionsFromOptions(
+    JNIEnv*, jclass, jlong joptions_handle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::ColumnFamilyOptions(
+      *reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(joptions_handle));
   return reinterpret_cast<jlong>(new_opt);
 }
 
@@ -3054,16 +3280,17 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_copyColumnFamilyOptions(
  * Signature: (Ljava/util/String;)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_getColumnFamilyOptionsFromProps(
-    JNIEnv* env, jclass /*jclazz*/, jstring jopt_string) {
+    JNIEnv* env, jclass, jstring jopt_string) {
   const char* opt_string = env->GetStringUTFChars(jopt_string, nullptr);
   if (opt_string == nullptr) {
     // exception thrown: OutOfMemoryError
     return 0;
   }
 
-  auto* cf_options = new rocksdb::ColumnFamilyOptions();
-  rocksdb::Status status = rocksdb::GetColumnFamilyOptionsFromString(
-      rocksdb::ColumnFamilyOptions(), opt_string, cf_options);
+  auto* cf_options = new ROCKSDB_NAMESPACE::ColumnFamilyOptions();
+  ROCKSDB_NAMESPACE::Status status =
+      ROCKSDB_NAMESPACE::GetColumnFamilyOptionsFromString(
+          ROCKSDB_NAMESPACE::ColumnFamilyOptions(), opt_string, cf_options);
 
   env->ReleaseStringUTFChars(jopt_string, opt_string);
 
@@ -3084,10 +3311,9 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_getColumnFamilyOptionsFromProps(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_disposeInternal(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong handle) {
-  auto* cfo = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(handle);
+void Java_org_rocksdb_ColumnFamilyOptions_disposeInternal(
+    JNIEnv*, jobject, jlong handle) {
+  auto* cfo = reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(handle);
   assert(cfo != nullptr);
   delete cfo;
 }
@@ -3097,10 +3323,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_disposeInternal(JNIEnv* /*env*/,
  * Method:    optimizeForSmallDb
  * Signature: (J)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_optimizeForSmallDb(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+void Java_org_rocksdb_ColumnFamilyOptions_optimizeForSmallDb(
+    JNIEnv*, jobject, jlong jhandle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->OptimizeForSmallDb();
 }
 
@@ -3110,9 +3335,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_optimizeForSmallDb(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_optimizeForPointLookup(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong block_cache_size_mb) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong block_cache_size_mb) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->OptimizeForPointLookup(block_cache_size_mb);
 }
 
@@ -3122,9 +3346,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_optimizeForPointLookup(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_optimizeLevelStyleCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong memtable_memory_budget) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong memtable_memory_budget) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->OptimizeLevelStyleCompaction(memtable_memory_budget);
 }
 
@@ -3134,9 +3357,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_optimizeLevelStyleCompaction(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_optimizeUniversalStyleCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong memtable_memory_budget) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong memtable_memory_budget) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->OptimizeUniversalStyleCompaction(memtable_memory_budget);
 }
 
@@ -3146,15 +3368,15 @@ void Java_org_rocksdb_ColumnFamilyOptions_optimizeUniversalStyleCompaction(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JI(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint builtinComparator) {
+    JNIEnv*, jobject, jlong jhandle, jint builtinComparator) {
   switch (builtinComparator) {
     case 1:
-      reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->comparator =
-          rocksdb::ReverseBytewiseComparator();
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+          ->comparator = ROCKSDB_NAMESPACE::ReverseBytewiseComparator();
       break;
     default:
-      reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->comparator =
-          rocksdb::BytewiseComparator();
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+          ->comparator = ROCKSDB_NAMESPACE::BytewiseComparator();
       break;
   }
 }
@@ -3165,28 +3387,24 @@ void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JI(
  * Signature: (JJB)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JJB(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jopt_handle,
-    jlong jcomparator_handle, jbyte jcomparator_type) {
-  rocksdb::Comparator* comparator = nullptr;
+    JNIEnv*, jobject, jlong jopt_handle, jlong jcomparator_handle,
+    jbyte jcomparator_type) {
+  ROCKSDB_NAMESPACE::Comparator* comparator = nullptr;
   switch (jcomparator_type) {
     // JAVA_COMPARATOR
     case 0x0:
-      comparator =
-          reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
-      break;
-
-    // JAVA_DIRECT_COMPARATOR
-    case 0x1:
-      comparator = reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(
+      comparator = reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallback*>(
           jcomparator_handle);
       break;
 
     // JAVA_NATIVE_COMPARATOR_WRAPPER
-    case 0x2:
-      comparator = reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
+    case 0x1:
+      comparator =
+          reinterpret_cast<ROCKSDB_NAMESPACE::Comparator*>(jcomparator_handle);
       break;
   }
-  auto* opt = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jopt_handle);
+  auto* opt =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jopt_handle);
   opt->comparator = comparator;
 }
 
@@ -3196,8 +3414,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JJB(
  * Signature: (JJjava/lang/String)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMergeOperatorName(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle, jstring jop_name) {
-  auto* options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv* env, jobject, jlong jhandle, jstring jop_name) {
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   const char* op_name = env->GetStringUTFChars(jop_name, nullptr);
   if (op_name == nullptr) {
     // exception thrown: OutOfMemoryError
@@ -3205,7 +3424,7 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMergeOperatorName(
   }
 
   options->merge_operator =
-      rocksdb::MergeOperators::CreateFromStringId(op_name);
+      ROCKSDB_NAMESPACE::MergeOperators::CreateFromStringId(op_name);
   env->ReleaseStringUTFChars(jop_name, op_name);
 }
 
@@ -3215,10 +3434,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMergeOperatorName(
  * Signature: (JJjava/lang/String)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMergeOperator(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong mergeOperatorHandle) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->merge_operator =
-      *(reinterpret_cast<std::shared_ptr<rocksdb::MergeOperator>*>(
+    JNIEnv*, jobject, jlong jhandle, jlong mergeOperatorHandle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->merge_operator =
+      *(reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::MergeOperator>*>(
           mergeOperatorHandle));
 }
 
@@ -3228,11 +3447,11 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMergeOperator(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompactionFilterHandle(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jopt_handle,
-    jlong jcompactionfilter_handle) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jopt_handle)
+    JNIEnv*, jobject, jlong jopt_handle, jlong jcompactionfilter_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jopt_handle)
       ->compaction_filter =
-      reinterpret_cast<rocksdb::CompactionFilter*>(jcompactionfilter_handle);
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactionFilter*>(
+          jcompactionfilter_handle);
 }
 
 /*
@@ -3240,14 +3459,13 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionFilterHandle(
  * Method:    setCompactionFilterFactoryHandle
  * Signature: (JJ)V
  */
-void JNICALL
-Java_org_rocksdb_ColumnFamilyOptions_setCompactionFilterFactoryHandle(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jopt_handle,
+void Java_org_rocksdb_ColumnFamilyOptions_setCompactionFilterFactoryHandle(
+    JNIEnv*, jobject, jlong jopt_handle,
     jlong jcompactionfilterfactory_handle) {
-  auto* cff_factory =
-      reinterpret_cast<std::shared_ptr<rocksdb::CompactionFilterFactoryJniCallback>*>(
-          jcompactionfilterfactory_handle);
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jopt_handle)
+  auto* cff_factory = reinterpret_cast<
+      std::shared_ptr<ROCKSDB_NAMESPACE::CompactionFilterFactoryJniCallback>*>(
+      jcompactionfilterfactory_handle);
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jopt_handle)
       ->compaction_filter_factory = *cff_factory;
 }
 
@@ -3257,14 +3475,14 @@ Java_org_rocksdb_ColumnFamilyOptions_setCompactionFilterFactoryHandle(
  * Signature: (JJ)I
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setWriteBufferSize(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jwrite_buffer_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(jwrite_buffer_size);
+    JNIEnv* env, jobject, jlong jhandle, jlong jwrite_buffer_size) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jwrite_buffer_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
         ->write_buffer_size = jwrite_buffer_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -3273,10 +3491,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setWriteBufferSize(
  * Method:    writeBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_writeBufferSize(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+jlong Java_org_rocksdb_ColumnFamilyOptions_writeBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->write_buffer_size;
 }
 
@@ -3286,9 +3503,8 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_writeBufferSize(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxWriteBufferNumber(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jmax_write_buffer_number) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jmax_write_buffer_number) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_write_buffer_number = jmax_write_buffer_number;
 }
 
@@ -3297,10 +3513,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxWriteBufferNumber(
  * Method:    maxWriteBufferNumber
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumber(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumber(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_write_buffer_number;
 }
 
@@ -3309,10 +3524,11 @@ jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumber(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMemTableFactory(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jlong jfactory_handle) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong jfactory_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->memtable_factory.reset(
-          reinterpret_cast<rocksdb::MemTableRepFactory*>(jfactory_handle));
+          reinterpret_cast<ROCKSDB_NAMESPACE::MemTableRepFactory*>(
+              jfactory_handle));
 }
 
 /*
@@ -3321,9 +3537,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMemTableFactory(
  * Signature: (J)Ljava/lang/String
  */
 jstring Java_org_rocksdb_ColumnFamilyOptions_memTableFactoryName(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  rocksdb::MemTableRepFactory* tf = opt->memtable_factory.get();
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto* opt =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  ROCKSDB_NAMESPACE::MemTableRepFactory* tf = opt->memtable_factory.get();
 
   // Should never be nullptr.
   // Default memtable factory is SkipListFactory
@@ -3342,10 +3559,10 @@ jstring Java_org_rocksdb_ColumnFamilyOptions_memTableFactoryName(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_useFixedLengthPrefixExtractor(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint jprefix_length) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
-      ->prefix_extractor.reset(
-          rocksdb::NewFixedPrefixTransform(static_cast<int>(jprefix_length)));
+    JNIEnv*, jobject, jlong jhandle, jint jprefix_length) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->prefix_extractor.reset(ROCKSDB_NAMESPACE::NewFixedPrefixTransform(
+          static_cast<int>(jprefix_length)));
 }
 
 /*
@@ -3353,10 +3570,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_useFixedLengthPrefixExtractor(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_useCappedPrefixExtractor(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint jprefix_length) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
-      ->prefix_extractor.reset(
-          rocksdb::NewCappedPrefixTransform(static_cast<int>(jprefix_length)));
+    JNIEnv*, jobject, jlong jhandle, jint jprefix_length) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->prefix_extractor.reset(ROCKSDB_NAMESPACE::NewCappedPrefixTransform(
+          static_cast<int>(jprefix_length)));
 }
 
 /*
@@ -3364,20 +3581,21 @@ void Java_org_rocksdb_ColumnFamilyOptions_useCappedPrefixExtractor(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setTableFactory(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jlong jfactory_handle) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->table_factory.reset(
-      reinterpret_cast<rocksdb::TableFactory*>(jfactory_handle));
+    JNIEnv*, jobject, jlong jhandle, jlong jfactory_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->table_factory.reset(
+          reinterpret_cast<ROCKSDB_NAMESPACE::TableFactory*>(jfactory_handle));
 }
 
 /*
  * Method:    tableFactoryName
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_ColumnFamilyOptions_tableFactoryName(JNIEnv* env,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  rocksdb::TableFactory* tf = opt->table_factory.get();
+jstring Java_org_rocksdb_ColumnFamilyOptions_tableFactoryName(
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto* opt =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  ROCKSDB_NAMESPACE::TableFactory* tf = opt->table_factory.get();
 
   // Should never be nullptr.
   // Default memtable factory is SkipListFactory
@@ -3392,8 +3610,8 @@ jstring Java_org_rocksdb_ColumnFamilyOptions_tableFactoryName(JNIEnv* env,
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_minWriteBufferNumberToMerge(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->min_write_buffer_number_to_merge;
 }
 
@@ -3403,9 +3621,8 @@ jint Java_org_rocksdb_ColumnFamilyOptions_minWriteBufferNumberToMerge(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMinWriteBufferNumberToMerge(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jmin_write_buffer_number_to_merge) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jmin_write_buffer_number_to_merge) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->min_write_buffer_number_to_merge =
       static_cast<int>(jmin_write_buffer_number_to_merge);
 }
@@ -3416,8 +3633,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMinWriteBufferNumberToMerge(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumberToMaintain(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_write_buffer_number_to_maintain;
 }
 
@@ -3427,9 +3644,9 @@ jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumberToMaintain(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxWriteBufferNumberToMaintain(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jmax_write_buffer_number_to_maintain) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_write_buffer_number_to_maintain =
       static_cast<int>(jmax_write_buffer_number_to_maintain);
 }
@@ -3440,11 +3657,12 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxWriteBufferNumberToMaintain(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompressionType(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jcompression_type_value) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  cf_opts->compression = rocksdb::CompressionTypeJni::toCppCompressionType(
-      jcompression_type_value);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompression_type_value) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  cf_opts->compression =
+      ROCKSDB_NAMESPACE::CompressionTypeJni::toCppCompressionType(
+          jcompression_type_value);
 }
 
 /*
@@ -3452,11 +3670,11 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompressionType(
  * Method:    compressionType
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ColumnFamilyOptions_compressionType(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  return rocksdb::CompressionTypeJni::toJavaCompressionType(
+jbyte Java_org_rocksdb_ColumnFamilyOptions_compressionType(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
       cf_opts->compression);
 }
 
@@ -3466,9 +3684,9 @@ jbyte Java_org_rocksdb_ColumnFamilyOptions_compressionType(JNIEnv* /*env*/,
  * Signature: (J[B)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompressionPerLevel(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jbyteArray jcompressionLevels) {
-  auto* options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv* env, jobject, jlong jhandle, jbyteArray jcompressionLevels) {
+  auto* options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   auto uptr_compression_levels =
       rocksdb_compression_vector_helper(env, jcompressionLevels);
   if (!uptr_compression_levels) {
@@ -3484,8 +3702,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompressionPerLevel(
  * Signature: (J)[B
  */
 jbyteArray Java_org_rocksdb_ColumnFamilyOptions_compressionPerLevel(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle) {
-  auto* cf_options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   return rocksdb_compression_list_helper(env,
                                          cf_options->compression_per_level);
 }
@@ -3496,11 +3715,11 @@ jbyteArray Java_org_rocksdb_ColumnFamilyOptions_compressionPerLevel(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setBottommostCompressionType(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jcompression_type_value) {
-  auto* cf_options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompression_type_value) {
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   cf_options->bottommost_compression =
-      rocksdb::CompressionTypeJni::toCppCompressionType(
+      ROCKSDB_NAMESPACE::CompressionTypeJni::toCppCompressionType(
           jcompression_type_value);
 }
 
@@ -3510,9 +3729,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_setBottommostCompressionType(
  * Signature: (J)B
  */
 jbyte Java_org_rocksdb_ColumnFamilyOptions_bottommostCompressionType(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* cf_options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  return rocksdb::CompressionTypeJni::toJavaCompressionType(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
       cf_options->bottommost_compression);
 }
 /*
@@ -3521,11 +3741,12 @@ jbyte Java_org_rocksdb_ColumnFamilyOptions_bottommostCompressionType(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setBottommostCompressionOptions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jbottommost_compression_options_handle) {
-  auto* cf_options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   auto* bottommost_compression_options =
-      reinterpret_cast<rocksdb::CompressionOptions*>(
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompressionOptions*>(
           jbottommost_compression_options_handle);
   cf_options->bottommost_compression_opts = *bottommost_compression_options;
 }
@@ -3536,11 +3757,12 @@ void Java_org_rocksdb_ColumnFamilyOptions_setBottommostCompressionOptions(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompressionOptions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jcompression_options_handle) {
-  auto* cf_options = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  auto* compression_options = reinterpret_cast<rocksdb::CompressionOptions*>(
-      jcompression_options_handle);
+    JNIEnv*, jobject, jlong jhandle, jlong jcompression_options_handle) {
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  auto* compression_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompressionOptions*>(
+          jcompression_options_handle);
   cf_options->compression_opts = *compression_options;
 }
 
@@ -3550,9 +3772,12 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompressionOptions(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompactionStyle(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jbyte compaction_style) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->compaction_style =
-      static_cast<rocksdb::CompactionStyle>(compaction_style);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompaction_style) {
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  cf_options->compaction_style =
+      ROCKSDB_NAMESPACE::CompactionStyleJni::toCppCompactionStyle(
+          jcompaction_style);
 }
 
 /*
@@ -3560,11 +3785,12 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionStyle(
  * Method:    compactionStyle
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionStyle(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
-      ->compaction_style;
+jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionStyle(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompactionStyleJni::toJavaCompactionStyle(
+      cf_options->compaction_style);
 }
 
 /*
@@ -3573,9 +3799,8 @@ jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionStyle(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxTableFilesSizeFIFO(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_table_files_size) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_table_files_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->compaction_options_fifo.max_table_files_size =
       static_cast<uint64_t>(jmax_table_files_size);
 }
@@ -3586,8 +3811,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxTableFilesSizeFIFO(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_maxTableFilesSizeFIFO(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->compaction_options_fifo.max_table_files_size;
 }
 
@@ -3596,10 +3821,10 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxTableFilesSizeFIFO(
  * Method:    numLevels
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ColumnFamilyOptions_numLevels(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->num_levels;
+jint Java_org_rocksdb_ColumnFamilyOptions_numLevels(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->num_levels;
 }
 
 /*
@@ -3607,12 +3832,10 @@ jint Java_org_rocksdb_ColumnFamilyOptions_numLevels(JNIEnv* /*env*/,
  * Method:    setNumLevels
  * Signature: (JI)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_setNumLevels(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle,
-                                                       jint jnum_levels) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->num_levels =
-      static_cast<int>(jnum_levels);
+void Java_org_rocksdb_ColumnFamilyOptions_setNumLevels(
+    JNIEnv*, jobject, jlong jhandle, jint jnum_levels) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->num_levels = static_cast<int>(jnum_levels);
 }
 
 /*
@@ -3621,8 +3844,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setNumLevels(JNIEnv* /*env*/,
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroFileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_file_num_compaction_trigger;
 }
 
@@ -3632,9 +3855,9 @@ jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroFileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroFileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jlevel0_file_num_compaction_trigger) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int>(jlevel0_file_num_compaction_trigger);
 }
@@ -3645,8 +3868,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroFileNumCompactionTrigger(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroSlowdownWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_slowdown_writes_trigger;
 }
 
@@ -3656,9 +3879,8 @@ jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroSlowdownWritesTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroSlowdownWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_slowdown_writes_trigger) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_slowdown_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_slowdown_writes_trigger =
       static_cast<int>(jlevel0_slowdown_writes_trigger);
 }
@@ -3669,8 +3891,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroSlowdownWritesTrigger(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroStopWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_stop_writes_trigger;
 }
 
@@ -3680,9 +3902,8 @@ jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroStopWritesTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroStopWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_stop_writes_trigger) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_stop_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_stop_writes_trigger =
       static_cast<int>(jlevel0_stop_writes_trigger);
 }
@@ -3692,10 +3913,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroStopWritesTrigger(
  * Method:    targetFileSizeBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeBase(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+jlong Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeBase(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->target_file_size_base;
 }
 
@@ -3705,9 +3925,8 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeBase(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setTargetFileSizeBase(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jtarget_file_size_base) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong jtarget_file_size_base) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->target_file_size_base = static_cast<uint64_t>(jtarget_file_size_base);
 }
 
@@ -3717,8 +3936,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setTargetFileSizeBase(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeMultiplier(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->target_file_size_multiplier;
 }
 
@@ -3728,9 +3947,8 @@ jint Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeMultiplier(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setTargetFileSizeMultiplier(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jtarget_file_size_multiplier) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jtarget_file_size_multiplier) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->target_file_size_multiplier =
       static_cast<int>(jtarget_file_size_multiplier);
 }
@@ -3741,8 +3959,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setTargetFileSizeMultiplier(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelBase(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_bytes_for_level_base;
 }
 
@@ -3752,9 +3970,8 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelBase(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelBase(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_bytes_for_level_base) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_bytes_for_level_base) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_bytes_for_level_base =
       static_cast<int64_t>(jmax_bytes_for_level_base);
 }
@@ -3765,8 +3982,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelBase(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ColumnFamilyOptions_levelCompactionDynamicLevelBytes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level_compaction_dynamic_level_bytes;
 }
 
@@ -3776,9 +3993,8 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_levelCompactionDynamicLevelBytes(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevelCompactionDynamicLevelBytes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jenable_dynamic_level_bytes) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_dynamic_level_bytes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level_compaction_dynamic_level_bytes = (jenable_dynamic_level_bytes);
 }
 
@@ -3788,8 +4004,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevelCompactionDynamicLevelBytes(
  * Signature: (J)D
  */
 jdouble Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplier(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_bytes_for_level_multiplier;
 }
 
@@ -3799,9 +4015,8 @@ jdouble Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplier(
  * Signature: (JD)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelMultiplier(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jdouble jmax_bytes_for_level_multiplier) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jdouble jmax_bytes_for_level_multiplier) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_bytes_for_level_multiplier =
       static_cast<double>(jmax_bytes_for_level_multiplier);
 }
@@ -3811,11 +4026,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelMultiplier(
  * Method:    maxCompactionBytes
  * Signature: (J)I
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_maxCompactionBytes(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_maxCompactionBytes(
+    JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jlong>(
-      reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
           ->max_compaction_bytes);
 }
 
@@ -3825,9 +4039,8 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxCompactionBytes(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxCompactionBytes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_compaction_bytes) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_compaction_bytes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_compaction_bytes = static_cast<uint64_t>(jmax_compaction_bytes);
 }
 
@@ -3836,10 +4049,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxCompactionBytes(
  * Method:    arenaBlockSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_arenaBlockSize(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+jlong Java_org_rocksdb_ColumnFamilyOptions_arenaBlockSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->arena_block_size;
 }
 
@@ -3849,13 +4061,14 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_arenaBlockSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setArenaBlockSize(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle, jlong jarena_block_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(jarena_block_size);
+    JNIEnv* env, jobject, jlong jhandle, jlong jarena_block_size) {
+  auto s =
+      ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(jarena_block_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->arena_block_size =
-        jarena_block_size;
+    reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+        ->arena_block_size = jarena_block_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -3865,8 +4078,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setArenaBlockSize(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ColumnFamilyOptions_disableAutoCompactions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->disable_auto_compactions;
 }
 
@@ -3876,9 +4089,8 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_disableAutoCompactions(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setDisableAutoCompactions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jdisable_auto_compactions) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean jdisable_auto_compactions) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->disable_auto_compactions = static_cast<bool>(jdisable_auto_compactions);
 }
 
@@ -3888,8 +4100,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setDisableAutoCompactions(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_maxSequentialSkipInIterations(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_sequential_skip_in_iterations;
 }
 
@@ -3899,9 +4111,9 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxSequentialSkipInIterations(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxSequentialSkipInIterations(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jmax_sequential_skip_in_iterations) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_sequential_skip_in_iterations =
       static_cast<int64_t>(jmax_sequential_skip_in_iterations);
 }
@@ -3912,8 +4124,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxSequentialSkipInIterations(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ColumnFamilyOptions_inplaceUpdateSupport(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->inplace_update_support;
 }
 
@@ -3923,9 +4135,8 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_inplaceUpdateSupport(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setInplaceUpdateSupport(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jinplace_update_support) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean jinplace_update_support) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->inplace_update_support = static_cast<bool>(jinplace_update_support);
 }
 
@@ -3935,8 +4146,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setInplaceUpdateSupport(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_inplaceUpdateNumLocks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->inplace_update_num_locks;
 }
 
@@ -3946,15 +4157,14 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_inplaceUpdateNumLocks(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setInplaceUpdateNumLocks(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jinplace_update_num_locks) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(jinplace_update_num_locks);
+    JNIEnv* env, jobject, jlong jhandle, jlong jinplace_update_num_locks) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jinplace_update_num_locks);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
         ->inplace_update_num_locks = jinplace_update_num_locks;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -3964,8 +4174,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setInplaceUpdateNumLocks(
  * Signature: (J)I
  */
 jdouble Java_org_rocksdb_ColumnFamilyOptions_memtablePrefixBloomSizeRatio(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->memtable_prefix_bloom_size_ratio;
 }
 
@@ -3975,9 +4185,9 @@ jdouble Java_org_rocksdb_ColumnFamilyOptions_memtablePrefixBloomSizeRatio(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMemtablePrefixBloomSizeRatio(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jdouble jmemtable_prefix_bloom_size_ratio) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->memtable_prefix_bloom_size_ratio =
       static_cast<double>(jmemtable_prefix_bloom_size_ratio);
 }
@@ -3987,10 +4197,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMemtablePrefixBloomSizeRatio(
  * Method:    bloomLocality
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ColumnFamilyOptions_bloomLocality(JNIEnv* /*env*/,
-                                                        jobject /*jobj*/,
-                                                        jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+jint Java_org_rocksdb_ColumnFamilyOptions_bloomLocality(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->bloom_locality;
 }
 
@@ -4000,9 +4209,9 @@ jint Java_org_rocksdb_ColumnFamilyOptions_bloomLocality(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setBloomLocality(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jint jbloom_locality) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)->bloom_locality =
-      static_cast<int32_t>(jbloom_locality);
+    JNIEnv*, jobject, jlong jhandle, jint jbloom_locality) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->bloom_locality = static_cast<int32_t>(jbloom_locality);
 }
 
 /*
@@ -4010,10 +4219,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setBloomLocality(
  * Method:    maxSuccessiveMerges
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_maxSuccessiveMerges(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+jlong Java_org_rocksdb_ColumnFamilyOptions_maxSuccessiveMerges(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_successive_merges;
 }
 
@@ -4023,15 +4231,14 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxSuccessiveMerges(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxSuccessiveMerges(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jmax_successive_merges) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(jmax_successive_merges);
+    JNIEnv* env, jobject, jlong jhandle, jlong jmax_successive_merges) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jmax_successive_merges);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
         ->max_successive_merges = jmax_successive_merges;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -4041,8 +4248,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxSuccessiveMerges(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ColumnFamilyOptions_optimizeFiltersForHits(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->optimize_filters_for_hits;
 }
 
@@ -4052,9 +4259,8 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_optimizeFiltersForHits(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setOptimizeFiltersForHits(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean joptimize_filters_for_hits) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean joptimize_filters_for_hits) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->optimize_filters_for_hits =
       static_cast<bool>(joptimize_filters_for_hits);
 }
@@ -4065,8 +4271,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setOptimizeFiltersForHits(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_memtableHugePageSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->memtable_huge_page_size;
 }
 
@@ -4076,15 +4282,14 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_memtableHugePageSize(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMemtableHugePageSize(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong jmemtable_huge_page_size) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(jmemtable_huge_page_size);
+    JNIEnv* env, jobject, jlong jhandle, jlong jmemtable_huge_page_size) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      jmemtable_huge_page_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
         ->memtable_huge_page_size = jmemtable_huge_page_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -4094,8 +4299,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMemtableHugePageSize(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_softPendingCompactionBytesLimit(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->soft_pending_compaction_bytes_limit;
 }
 
@@ -4105,9 +4310,9 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_softPendingCompactionBytesLimit(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setSoftPendingCompactionBytesLimit(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jsoft_pending_compaction_bytes_limit) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->soft_pending_compaction_bytes_limit =
       static_cast<int64_t>(jsoft_pending_compaction_bytes_limit);
 }
@@ -4118,8 +4323,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setSoftPendingCompactionBytesLimit(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_ColumnFamilyOptions_hardPendingCompactionBytesLimit(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->hard_pending_compaction_bytes_limit;
 }
 
@@ -4129,9 +4334,9 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_hardPendingCompactionBytesLimit(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setHardPendingCompactionBytesLimit(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jhard_pending_compaction_bytes_limit) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->hard_pending_compaction_bytes_limit =
       static_cast<int64_t>(jhard_pending_compaction_bytes_limit);
 }
@@ -4142,8 +4347,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setHardPendingCompactionBytesLimit(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_level0FileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_file_num_compaction_trigger;
 }
 
@@ -4153,9 +4358,9 @@ jint Java_org_rocksdb_ColumnFamilyOptions_level0FileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevel0FileNumCompactionTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jint jlevel0_file_num_compaction_trigger) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int32_t>(jlevel0_file_num_compaction_trigger);
 }
@@ -4166,8 +4371,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevel0FileNumCompactionTrigger(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_level0SlowdownWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_slowdown_writes_trigger;
 }
 
@@ -4177,9 +4382,8 @@ jint Java_org_rocksdb_ColumnFamilyOptions_level0SlowdownWritesTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevel0SlowdownWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_slowdown_writes_trigger) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_slowdown_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_slowdown_writes_trigger =
       static_cast<int32_t>(jlevel0_slowdown_writes_trigger);
 }
@@ -4190,8 +4394,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevel0SlowdownWritesTrigger(
  * Signature: (J)I
  */
 jint Java_org_rocksdb_ColumnFamilyOptions_level0StopWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_stop_writes_trigger;
 }
 
@@ -4201,9 +4405,8 @@ jint Java_org_rocksdb_ColumnFamilyOptions_level0StopWritesTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevel0StopWritesTrigger(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jlevel0_stop_writes_trigger) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_stop_writes_trigger) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_stop_writes_trigger =
       static_cast<int32_t>(jlevel0_stop_writes_trigger);
 }
@@ -4213,11 +4416,11 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevel0StopWritesTrigger(
  * Method:    maxBytesForLevelMultiplierAdditional
  * Signature: (J)[I
  */
-jintArray
-Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplierAdditional(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle) {
-  auto mbflma = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
-                    ->max_bytes_for_level_multiplier_additional;
+jintArray Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplierAdditional(
+    JNIEnv* env, jobject, jlong jhandle) {
+  auto mbflma =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+          ->max_bytes_for_level_multiplier_additional;
 
   const size_t size = mbflma.size();
 
@@ -4252,7 +4455,7 @@ Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplierAdditional(
  * Signature: (J[I)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelMultiplierAdditional(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
+    JNIEnv* env, jobject, jlong jhandle,
     jintArray jmax_bytes_for_level_multiplier_additional) {
   jsize len = env->GetArrayLength(jmax_bytes_for_level_multiplier_additional);
   jint* additionals =
@@ -4262,7 +4465,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelMultiplierAdditiona
     return;
   }
 
-  auto* cf_opt = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+  auto* cf_opt =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   cf_opt->max_bytes_for_level_multiplier_additional.clear();
   for (jsize i = 0; i < len; i++) {
     cf_opt->max_bytes_for_level_multiplier_additional.push_back(
@@ -4279,8 +4483,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelMultiplierAdditiona
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ColumnFamilyOptions_paranoidFileChecks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->paranoid_file_checks;
 }
 
@@ -4290,9 +4494,8 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_paranoidFileChecks(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setParanoidFileChecks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jparanoid_file_checks) {
-  reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean jparanoid_file_checks) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->paranoid_file_checks = static_cast<bool>(jparanoid_file_checks);
 }
 
@@ -4302,11 +4505,11 @@ void Java_org_rocksdb_ColumnFamilyOptions_setParanoidFileChecks(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompactionPriority(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jcompaction_priority_value) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jbyte jcompaction_priority_value) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   cf_opts->compaction_pri =
-      rocksdb::CompactionPriorityJni::toCppCompactionPriority(
+      ROCKSDB_NAMESPACE::CompactionPriorityJni::toCppCompactionPriority(
           jcompaction_priority_value);
 }
 
@@ -4315,11 +4518,11 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionPriority(
  * Method:    compactionPriority
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionPriority(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  return rocksdb::CompactionPriorityJni::toJavaCompactionPriority(
+jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionPriority(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompactionPriorityJni::toJavaCompactionPriority(
       cf_opts->compaction_pri);
 }
 
@@ -4329,9 +4532,9 @@ jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionPriority(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setReportBgIoStats(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jreport_bg_io_stats) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jreport_bg_io_stats) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   cf_opts->report_bg_io_stats = static_cast<bool>(jreport_bg_io_stats);
 }
 
@@ -4340,24 +4543,50 @@ void Java_org_rocksdb_ColumnFamilyOptions_setReportBgIoStats(
  * Method:    reportBgIoStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ColumnFamilyOptions_reportBgIoStats(JNIEnv* /*env*/,
-                                                              jobject /*jobj*/,
-                                                              jlong jhandle) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+jboolean Java_org_rocksdb_ColumnFamilyOptions_reportBgIoStats(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   return static_cast<bool>(cf_opts->report_bg_io_stats);
 }
 
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setTtl
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setTtl(
+    JNIEnv*, jobject, jlong jhandle, jlong jttl) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  cf_opts->ttl = static_cast<uint64_t>(jttl);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    ttl
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_rocksdb_ColumnFamilyOptions_ttl(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jlong>(cf_opts->ttl);
+}
+
 /*
  * Class:     org_rocksdb_ColumnFamilyOptions
  * Method:    setCompactionOptionsUniversal
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompactionOptionsUniversal(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jlong jcompaction_options_universal_handle) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  auto* opts_uni = reinterpret_cast<rocksdb::CompactionOptionsUniversal*>(
-      jcompaction_options_universal_handle);
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  auto* opts_uni =
+      reinterpret_cast<ROCKSDB_NAMESPACE::CompactionOptionsUniversal*>(
+          jcompaction_options_universal_handle);
   cf_opts->compaction_options_universal = *opts_uni;
 }
 
@@ -4367,10 +4596,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionOptionsUniversal(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setCompactionOptionsFIFO(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jcompaction_options_fifo_handle) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
-  auto* opts_fifo = reinterpret_cast<rocksdb::CompactionOptionsFIFO*>(
+    JNIEnv*, jobject, jlong jhandle, jlong jcompaction_options_fifo_handle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  auto* opts_fifo = reinterpret_cast<ROCKSDB_NAMESPACE::CompactionOptionsFIFO*>(
       jcompaction_options_fifo_handle);
   cf_opts->compaction_options_fifo = *opts_fifo;
 }
@@ -4381,9 +4610,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionOptionsFIFO(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setForceConsistencyChecks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jforce_consistency_checks) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jforce_consistency_checks) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   cf_opts->force_consistency_checks =
       static_cast<bool>(jforce_consistency_checks);
 }
@@ -4394,21 +4623,23 @@ void Java_org_rocksdb_ColumnFamilyOptions_setForceConsistencyChecks(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ColumnFamilyOptions_forceConsistencyChecks(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* cf_opts = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   return static_cast<bool>(cf_opts->force_consistency_checks);
 }
 
 /////////////////////////////////////////////////////////////////////
-// rocksdb::DBOptions
+// ROCKSDB_NAMESPACE::DBOptions
 
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    newDBOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_DBOptions_newDBOptions(JNIEnv* /*env*/, jclass /*jcls*/) {
-  auto* dbop = new rocksdb::DBOptions();
+jlong Java_org_rocksdb_DBOptions_newDBOptions(
+    JNIEnv*, jclass) {
+  auto* dbop = new ROCKSDB_NAMESPACE::DBOptions();
   return reinterpret_cast<jlong>(dbop);
 }
 
@@ -4417,30 +4648,41 @@ jlong Java_org_rocksdb_DBOptions_newDBOptions(JNIEnv* /*env*/, jclass /*jcls*/)
  * Method:    copyDBOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_copyDBOptions(JNIEnv* /*env*/, jclass /*jcls*/,
-                                               jlong jhandle) {
-  auto new_opt =
-      new rocksdb::DBOptions(*(reinterpret_cast<rocksdb::DBOptions*>(jhandle)));
+jlong Java_org_rocksdb_DBOptions_copyDBOptions(
+    JNIEnv*, jclass, jlong jhandle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::DBOptions(
+      *(reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)));
   return reinterpret_cast<jlong>(new_opt);
 }
 
 /*
  * Class:     org_rocksdb_DBOptions
- * Method:    getDBOptionsFromProps
- * Signature: (Ljava/util/String;)J
+ * Method:    newDBOptionsFromOptions
+ * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_getDBOptionsFromProps(JNIEnv* env,
-                                                       jclass /*jclazz*/,
-                                                       jstring jopt_string) {
-  const char* opt_string = env->GetStringUTFChars(jopt_string, nullptr);
-  if (opt_string == nullptr) {
-    // exception thrown: OutOfMemoryError
+jlong Java_org_rocksdb_DBOptions_newDBOptionsFromOptions(
+    JNIEnv*, jclass, jlong joptions_handle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::DBOptions(
+      *reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(joptions_handle));
+  return reinterpret_cast<jlong>(new_opt);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    getDBOptionsFromProps
+ * Signature: (Ljava/util/String;)J
+ */
+jlong Java_org_rocksdb_DBOptions_getDBOptionsFromProps(
+    JNIEnv* env, jclass, jstring jopt_string) {
+  const char* opt_string = env->GetStringUTFChars(jopt_string, nullptr);
+  if (opt_string == nullptr) {
+    // exception thrown: OutOfMemoryError
     return 0;
   }
 
-  auto* db_options = new rocksdb::DBOptions();
-  rocksdb::Status status = rocksdb::GetDBOptionsFromString(
-      rocksdb::DBOptions(), opt_string, db_options);
+  auto* db_options = new ROCKSDB_NAMESPACE::DBOptions();
+  ROCKSDB_NAMESPACE::Status status = ROCKSDB_NAMESPACE::GetDBOptionsFromString(
+      ROCKSDB_NAMESPACE::DBOptions(), opt_string, db_options);
 
   env->ReleaseStringUTFChars(jopt_string, opt_string);
 
@@ -4461,10 +4703,9 @@ jlong Java_org_rocksdb_DBOptions_getDBOptionsFromProps(JNIEnv* env,
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_DBOptions_disposeInternal(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong handle) {
-  auto* dbo = reinterpret_cast<rocksdb::DBOptions*>(handle);
+void Java_org_rocksdb_DBOptions_disposeInternal(
+    JNIEnv*, jobject, jlong handle) {
+  auto* dbo = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(handle);
   assert(dbo != nullptr);
   delete dbo;
 }
@@ -4474,10 +4715,10 @@ void Java_org_rocksdb_DBOptions_disposeInternal(JNIEnv* /*env*/,
  * Method:    optimizeForSmallDb
  * Signature: (J)V
  */
-void Java_org_rocksdb_DBOptions_optimizeForSmallDb(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->OptimizeForSmallDb();
+void Java_org_rocksdb_DBOptions_optimizeForSmallDb(
+    JNIEnv*, jobject, jlong jhandle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->OptimizeForSmallDb();
 }
 
 /*
@@ -4485,10 +4726,10 @@ void Java_org_rocksdb_DBOptions_optimizeForSmallDb(JNIEnv* /*env*/,
  * Method:    setEnv
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setEnv(JNIEnv* /*env*/, jobject /*jobj*/,
-                                       jlong jhandle, jlong jenv_handle) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->env =
-      reinterpret_cast<rocksdb::Env*>(jenv_handle);
+void Java_org_rocksdb_DBOptions_setEnv(
+    JNIEnv*, jobject, jlong jhandle, jlong jenv_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->env =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Env*>(jenv_handle);
 }
 
 /*
@@ -4496,11 +4737,9 @@ void Java_org_rocksdb_DBOptions_setEnv(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setIncreaseParallelism
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setIncreaseParallelism(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle,
-                                                       jint totalThreads) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->IncreaseParallelism(
+void Java_org_rocksdb_DBOptions_setIncreaseParallelism(
+    JNIEnv*, jobject, jlong jhandle, jint totalThreads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->IncreaseParallelism(
       static_cast<int>(totalThreads));
 }
 
@@ -4509,11 +4748,10 @@ void Java_org_rocksdb_DBOptions_setIncreaseParallelism(JNIEnv* /*env*/,
  * Method:    setCreateIfMissing
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setCreateIfMissing(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jboolean flag) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->create_if_missing = flag;
+void Java_org_rocksdb_DBOptions_setCreateIfMissing(
+    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->create_if_missing =
+      flag;
 }
 
 /*
@@ -4521,10 +4759,10 @@ void Java_org_rocksdb_DBOptions_setCreateIfMissing(JNIEnv* /*env*/,
  * Method:    createIfMissing
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_createIfMissing(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->create_if_missing;
+jboolean Java_org_rocksdb_DBOptions_createIfMissing(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->create_if_missing;
 }
 
 /*
@@ -4532,11 +4770,9 @@ jboolean Java_org_rocksdb_DBOptions_createIfMissing(JNIEnv* /*env*/,
  * Method:    setCreateMissingColumnFamilies
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setCreateMissingColumnFamilies(JNIEnv* /*env*/,
-                                                               jobject /*jobj*/,
-                                                               jlong jhandle,
-                                                               jboolean flag) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+void Java_org_rocksdb_DBOptions_setCreateMissingColumnFamilies(
+    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->create_missing_column_families = flag;
 }
 
@@ -4546,8 +4782,8 @@ void Java_org_rocksdb_DBOptions_setCreateMissingColumnFamilies(JNIEnv* /*env*/,
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_DBOptions_createMissingColumnFamilies(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->create_missing_column_families;
 }
 
@@ -4556,11 +4792,9 @@ jboolean Java_org_rocksdb_DBOptions_createMissingColumnFamilies(
  * Method:    setErrorIfExists
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setErrorIfExists(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jboolean error_if_exists) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->error_if_exists =
+void Java_org_rocksdb_DBOptions_setErrorIfExists(
+    JNIEnv*, jobject, jlong jhandle, jboolean error_if_exists) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->error_if_exists =
       static_cast<bool>(error_if_exists);
 }
 
@@ -4569,10 +4803,10 @@ void Java_org_rocksdb_DBOptions_setErrorIfExists(JNIEnv* /*env*/,
  * Method:    errorIfExists
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_errorIfExists(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->error_if_exists;
+jboolean Java_org_rocksdb_DBOptions_errorIfExists(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->error_if_exists;
 }
 
 /*
@@ -4580,11 +4814,9 @@ jboolean Java_org_rocksdb_DBOptions_errorIfExists(JNIEnv* /*env*/,
  * Method:    setParanoidChecks
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setParanoidChecks(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jboolean paranoid_checks) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->paranoid_checks =
+void Java_org_rocksdb_DBOptions_setParanoidChecks(
+    JNIEnv*, jobject, jlong jhandle, jboolean paranoid_checks) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->paranoid_checks =
       static_cast<bool>(paranoid_checks);
 }
 
@@ -4593,10 +4825,10 @@ void Java_org_rocksdb_DBOptions_setParanoidChecks(JNIEnv* /*env*/,
  * Method:    paranoidChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_paranoidChecks(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->paranoid_checks;
+jboolean Java_org_rocksdb_DBOptions_paranoidChecks(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->paranoid_checks;
 }
 
 /*
@@ -4604,13 +4836,13 @@ jboolean Java_org_rocksdb_DBOptions_paranoidChecks(JNIEnv* /*env*/,
  * Method:    setRateLimiter
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setRateLimiter(JNIEnv* /*env*/,
-                                               jobject /*jobj*/, jlong jhandle,
-                                               jlong jrate_limiter_handle) {
-  std::shared_ptr<rocksdb::RateLimiter>* pRateLimiter =
-      reinterpret_cast<std::shared_ptr<rocksdb::RateLimiter>*>(
+void Java_org_rocksdb_DBOptions_setRateLimiter(
+    JNIEnv*, jobject, jlong jhandle, jlong jrate_limiter_handle) {
+  std::shared_ptr<ROCKSDB_NAMESPACE::RateLimiter>* pRateLimiter =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::RateLimiter>*>(
           jrate_limiter_handle);
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->rate_limiter = *pRateLimiter;
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->rate_limiter =
+      *pRateLimiter;
 }
 
 /*
@@ -4619,12 +4851,11 @@ void Java_org_rocksdb_DBOptions_setRateLimiter(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setSstFileManager(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jsst_file_manager_handle) {
+    JNIEnv*, jobject, jlong jhandle, jlong jsst_file_manager_handle) {
   auto* sptr_sst_file_manager =
-      reinterpret_cast<std::shared_ptr<rocksdb::SstFileManager>*>(
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::SstFileManager>*>(
           jsst_file_manager_handle);
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->sst_file_manager =
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->sst_file_manager =
       *sptr_sst_file_manager;
 }
 
@@ -4633,12 +4864,12 @@ void Java_org_rocksdb_DBOptions_setSstFileManager(
  * Method:    setLogger
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setLogger(JNIEnv* /*env*/, jobject /*jobj*/,
-                                          jlong jhandle, jlong jlogger_handle) {
-  std::shared_ptr<rocksdb::LoggerJniCallback>* pLogger =
-      reinterpret_cast<std::shared_ptr<rocksdb::LoggerJniCallback>*>(
+void Java_org_rocksdb_DBOptions_setLogger(
+    JNIEnv*, jobject, jlong jhandle, jlong jlogger_handle) {
+  std::shared_ptr<ROCKSDB_NAMESPACE::LoggerJniCallback>* pLogger =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::LoggerJniCallback>*>(
           jlogger_handle);
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->info_log = *pLogger;
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->info_log = *pLogger;
 }
 
 /*
@@ -4646,11 +4877,10 @@ void Java_org_rocksdb_DBOptions_setLogger(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setInfoLogLevel
  * Signature: (JB)V
  */
-void Java_org_rocksdb_DBOptions_setInfoLogLevel(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jbyte jlog_level) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->info_log_level =
-      static_cast<rocksdb::InfoLogLevel>(jlog_level);
+void Java_org_rocksdb_DBOptions_setInfoLogLevel(
+    JNIEnv*, jobject, jlong jhandle, jbyte jlog_level) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->info_log_level =
+      static_cast<ROCKSDB_NAMESPACE::InfoLogLevel>(jlog_level);
 }
 
 /*
@@ -4658,10 +4888,10 @@ void Java_org_rocksdb_DBOptions_setInfoLogLevel(JNIEnv* /*env*/,
  * Method:    infoLogLevel
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_DBOptions_infoLogLevel(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
+jbyte Java_org_rocksdb_DBOptions_infoLogLevel(
+    JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jbyte>(
-      reinterpret_cast<rocksdb::DBOptions*>(jhandle)->info_log_level);
+      reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->info_log_level);
 }
 
 /*
@@ -4669,11 +4899,9 @@ jbyte Java_org_rocksdb_DBOptions_infoLogLevel(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setMaxTotalWalSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setMaxTotalWalSize(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jlong jmax_total_wal_size) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_total_wal_size =
+void Java_org_rocksdb_DBOptions_setMaxTotalWalSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_total_wal_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->max_total_wal_size =
       static_cast<jlong>(jmax_total_wal_size);
 }
 
@@ -4682,10 +4910,10 @@ void Java_org_rocksdb_DBOptions_setMaxTotalWalSize(JNIEnv* /*env*/,
  * Method:    maxTotalWalSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_maxTotalWalSize(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_total_wal_size;
+jlong Java_org_rocksdb_DBOptions_maxTotalWalSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_total_wal_size;
 }
 
 /*
@@ -4693,10 +4921,9 @@ jlong Java_org_rocksdb_DBOptions_maxTotalWalSize(JNIEnv* /*env*/,
  * Method:    setMaxOpenFiles
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxOpenFiles(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jint max_open_files) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_open_files =
+void Java_org_rocksdb_DBOptions_setMaxOpenFiles(
+    JNIEnv*, jobject, jlong jhandle, jint max_open_files) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->max_open_files =
       static_cast<int>(max_open_files);
 }
 
@@ -4705,9 +4932,10 @@ void Java_org_rocksdb_DBOptions_setMaxOpenFiles(JNIEnv* /*env*/,
  * Method:    maxOpenFiles
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxOpenFiles(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_open_files;
+jint Java_org_rocksdb_DBOptions_maxOpenFiles(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_open_files;
 }
 
 /*
@@ -4716,10 +4944,9 @@ jint Java_org_rocksdb_DBOptions_maxOpenFiles(JNIEnv* /*env*/, jobject /*jobj*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_DBOptions_setMaxFileOpeningThreads(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint jmax_file_opening_threads) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_file_opening_threads =
-      static_cast<int>(jmax_file_opening_threads);
+    JNIEnv*, jobject, jlong jhandle, jint jmax_file_opening_threads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_file_opening_threads = static_cast<int>(jmax_file_opening_threads);
 }
 
 /*
@@ -4727,10 +4954,9 @@ void Java_org_rocksdb_DBOptions_setMaxFileOpeningThreads(
  * Method:    maxFileOpeningThreads
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxFileOpeningThreads(JNIEnv* /*env*/,
-                                                      jobject /*jobj*/,
-                                                      jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jint Java_org_rocksdb_DBOptions_maxFileOpeningThreads(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<int>(opt->max_file_opening_threads);
 }
 
@@ -4739,12 +4965,12 @@ jint Java_org_rocksdb_DBOptions_maxFileOpeningThreads(JNIEnv* /*env*/,
  * Method:    setStatistics
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setStatistics(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle,
-                                              jlong jstatistics_handle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  auto* pSptr = reinterpret_cast<std::shared_ptr<rocksdb::StatisticsJni>*>(
-      jstatistics_handle);
+void Java_org_rocksdb_DBOptions_setStatistics(
+    JNIEnv*, jobject, jlong jhandle, jlong jstatistics_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  auto* pSptr =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::StatisticsJni>*>(
+          jstatistics_handle);
   opt->statistics = *pSptr;
 }
 
@@ -4753,15 +4979,15 @@ void Java_org_rocksdb_DBOptions_setStatistics(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    statistics
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_statistics(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  std::shared_ptr<rocksdb::Statistics> sptr = opt->statistics;
+jlong Java_org_rocksdb_DBOptions_statistics(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  std::shared_ptr<ROCKSDB_NAMESPACE::Statistics> sptr = opt->statistics;
   if (sptr == nullptr) {
     return 0;
   } else {
-    std::shared_ptr<rocksdb::Statistics>* pSptr =
-        new std::shared_ptr<rocksdb::Statistics>(sptr);
+    std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>* pSptr =
+        new std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>(sptr);
     return reinterpret_cast<jlong>(pSptr);
   }
 }
@@ -4771,9 +4997,9 @@ jlong Java_org_rocksdb_DBOptions_statistics(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setUseFsync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setUseFsync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle, jboolean use_fsync) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->use_fsync =
+void Java_org_rocksdb_DBOptions_setUseFsync(
+    JNIEnv*, jobject, jlong jhandle, jboolean use_fsync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->use_fsync =
       static_cast<bool>(use_fsync);
 }
 
@@ -4782,9 +5008,9 @@ void Java_org_rocksdb_DBOptions_setUseFsync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    useFsync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_useFsync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->use_fsync;
+jboolean Java_org_rocksdb_DBOptions_useFsync(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->use_fsync;
 }
 
 /*
@@ -4792,10 +5018,10 @@ jboolean Java_org_rocksdb_DBOptions_useFsync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setDbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_DBOptions_setDbPaths(JNIEnv* env, jobject /*jobj*/,
-                                           jlong jhandle, jobjectArray jpaths,
-                                           jlongArray jtarget_sizes) {
-  std::vector<rocksdb::DbPath> db_paths;
+void Java_org_rocksdb_DBOptions_setDbPaths(
+    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
+    jlongArray jtarget_sizes) {
+  std::vector<ROCKSDB_NAMESPACE::DbPath> db_paths;
   jlong* ptr_jtarget_size = env->GetLongArrayElements(jtarget_sizes, nullptr);
   if (ptr_jtarget_size == nullptr) {
     // exception thrown: OutOfMemoryError
@@ -4812,7 +5038,7 @@ void Java_org_rocksdb_DBOptions_setDbPaths(JNIEnv* env, jobject /*jobj*/,
       env->ReleaseLongArrayElements(jtarget_sizes, ptr_jtarget_size, JNI_ABORT);
       return;
     }
-    std::string path = rocksdb::JniUtil::copyStdString(
+    std::string path = ROCKSDB_NAMESPACE::JniUtil::copyStdString(
         env, static_cast<jstring>(jpath), &has_exception);
     env->DeleteLocalRef(jpath);
 
@@ -4824,12 +5050,12 @@ void Java_org_rocksdb_DBOptions_setDbPaths(JNIEnv* env, jobject /*jobj*/,
     jlong jtarget_size = ptr_jtarget_size[i];
 
     db_paths.push_back(
-        rocksdb::DbPath(path, static_cast<uint64_t>(jtarget_size)));
+        ROCKSDB_NAMESPACE::DbPath(path, static_cast<uint64_t>(jtarget_size)));
   }
 
   env->ReleaseLongArrayElements(jtarget_sizes, ptr_jtarget_size, JNI_ABORT);
 
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->db_paths = db_paths;
 }
 
@@ -4838,9 +5064,9 @@ void Java_org_rocksdb_DBOptions_setDbPaths(JNIEnv* env, jobject /*jobj*/,
  * Method:    dbPathsLen
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_dbPathsLen(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_dbPathsLen(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->db_paths.size());
 }
 
@@ -4849,19 +5075,19 @@ jlong Java_org_rocksdb_DBOptions_dbPathsLen(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    dbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_DBOptions_dbPaths(JNIEnv* env, jobject /*jobj*/,
-                                        jlong jhandle, jobjectArray jpaths,
-                                        jlongArray jtarget_sizes) {
+void Java_org_rocksdb_DBOptions_dbPaths(
+    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
+    jlongArray jtarget_sizes) {
   jlong* ptr_jtarget_size = env->GetLongArrayElements(jtarget_sizes, nullptr);
   if (ptr_jtarget_size == nullptr) {
     // exception thrown: OutOfMemoryError
     return;
   }
 
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   const jsize len = env->GetArrayLength(jpaths);
   for (jsize i = 0; i < len; i++) {
-    rocksdb::DbPath db_path = opt->db_paths[i];
+    ROCKSDB_NAMESPACE::DbPath db_path = opt->db_paths[i];
 
     jstring jpath = env->NewStringUTF(db_path.path.c_str());
     if (jpath == nullptr) {
@@ -4888,16 +5114,16 @@ void Java_org_rocksdb_DBOptions_dbPaths(JNIEnv* env, jobject /*jobj*/,
  * Method:    setDbLogDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_DBOptions_setDbLogDir(JNIEnv* env, jobject /*jobj*/,
-                                            jlong jhandle,
-                                            jstring jdb_log_dir) {
+void Java_org_rocksdb_DBOptions_setDbLogDir(
+    JNIEnv* env, jobject, jlong jhandle, jstring jdb_log_dir) {
   const char* log_dir = env->GetStringUTFChars(jdb_log_dir, nullptr);
   if (log_dir == nullptr) {
     // exception thrown: OutOfMemoryError
     return;
   }
 
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->db_log_dir.assign(log_dir);
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->db_log_dir.assign(
+      log_dir);
   env->ReleaseStringUTFChars(jdb_log_dir, log_dir);
 }
 
@@ -4906,10 +5132,11 @@ void Java_org_rocksdb_DBOptions_setDbLogDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    dbLogDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_DBOptions_dbLogDir(JNIEnv* env, jobject /*jobj*/,
-                                            jlong jhandle) {
+jstring Java_org_rocksdb_DBOptions_dbLogDir(
+    JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
-      reinterpret_cast<rocksdb::DBOptions*>(jhandle)->db_log_dir.c_str());
+      reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+          ->db_log_dir.c_str());
 }
 
 /*
@@ -4917,10 +5144,11 @@ jstring Java_org_rocksdb_DBOptions_dbLogDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    setWalDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_DBOptions_setWalDir(JNIEnv* env, jobject /*jobj*/,
-                                          jlong jhandle, jstring jwal_dir) {
+void Java_org_rocksdb_DBOptions_setWalDir(
+    JNIEnv* env, jobject, jlong jhandle, jstring jwal_dir) {
   const char* wal_dir = env->GetStringUTFChars(jwal_dir, 0);
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->wal_dir.assign(wal_dir);
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->wal_dir.assign(
+      wal_dir);
   env->ReleaseStringUTFChars(jwal_dir, wal_dir);
 }
 
@@ -4929,10 +5157,11 @@ void Java_org_rocksdb_DBOptions_setWalDir(JNIEnv* env, jobject /*jobj*/,
  * Method:    walDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_DBOptions_walDir(JNIEnv* env, jobject /*jobj*/,
-                                          jlong jhandle) {
+jstring Java_org_rocksdb_DBOptions_walDir(
+    JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
-      reinterpret_cast<rocksdb::DBOptions*>(jhandle)->wal_dir.c_str());
+      reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+          ->wal_dir.c_str());
 }
 
 /*
@@ -4941,8 +5170,8 @@ jstring Java_org_rocksdb_DBOptions_walDir(JNIEnv* env, jobject /*jobj*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setDeleteObsoleteFilesPeriodMicros(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jlong micros) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jlong micros) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->delete_obsolete_files_period_micros = static_cast<int64_t>(micros);
 }
 
@@ -4952,8 +5181,8 @@ void Java_org_rocksdb_DBOptions_setDeleteObsoleteFilesPeriodMicros(
  * Signature: (J)J
  */
 jlong Java_org_rocksdb_DBOptions_deleteObsoleteFilesPeriodMicros(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->delete_obsolete_files_period_micros;
 }
 
@@ -4962,12 +5191,10 @@ jlong Java_org_rocksdb_DBOptions_deleteObsoleteFilesPeriodMicros(
  * Method:    setBaseBackgroundCompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setBaseBackgroundCompactions(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle,
-                                                             jint max) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->base_background_compactions =
-      static_cast<int>(max);
+void Java_org_rocksdb_DBOptions_setBaseBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle, jint max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->base_background_compactions = static_cast<int>(max);
 }
 
 /*
@@ -4975,10 +5202,9 @@ void Java_org_rocksdb_DBOptions_setBaseBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    baseBackgroundCompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_baseBackgroundCompactions(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+jint Java_org_rocksdb_DBOptions_baseBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->base_background_compactions;
 }
 
@@ -4987,12 +5213,10 @@ jint Java_org_rocksdb_DBOptions_baseBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    setMaxBackgroundCompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxBackgroundCompactions(JNIEnv* /*env*/,
-                                                            jobject /*jobj*/,
-                                                            jlong jhandle,
-                                                            jint max) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_background_compactions =
-      static_cast<int>(max);
+void Java_org_rocksdb_DBOptions_setMaxBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle, jint max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_background_compactions = static_cast<int>(max);
 }
 
 /*
@@ -5000,10 +5224,9 @@ void Java_org_rocksdb_DBOptions_setMaxBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    maxBackgroundCompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxBackgroundCompactions(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+jint Java_org_rocksdb_DBOptions_maxBackgroundCompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_background_compactions;
 }
 
@@ -5012,10 +5235,9 @@ jint Java_org_rocksdb_DBOptions_maxBackgroundCompactions(JNIEnv* /*env*/,
  * Method:    setMaxSubcompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxSubcompactions(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle, jint max) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_subcompactions =
+void Java_org_rocksdb_DBOptions_setMaxSubcompactions(
+    JNIEnv*, jobject, jlong jhandle, jint max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->max_subcompactions =
       static_cast<int32_t>(max);
 }
 
@@ -5024,10 +5246,10 @@ void Java_org_rocksdb_DBOptions_setMaxSubcompactions(JNIEnv* /*env*/,
  * Method:    maxSubcompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxSubcompactions(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_subcompactions;
+jint Java_org_rocksdb_DBOptions_maxSubcompactions(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_subcompactions;
 }
 
 /*
@@ -5036,10 +5258,9 @@ jint Java_org_rocksdb_DBOptions_maxSubcompactions(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_DBOptions_setMaxBackgroundFlushes(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint max_background_flushes) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_background_flushes =
-      static_cast<int>(max_background_flushes);
+    JNIEnv*, jobject, jlong jhandle, jint max_background_flushes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_background_flushes = static_cast<int>(max_background_flushes);
 }
 
 /*
@@ -5047,10 +5268,10 @@ void Java_org_rocksdb_DBOptions_setMaxBackgroundFlushes(
  * Method:    maxBackgroundFlushes
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxBackgroundFlushes(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_background_flushes;
+jint Java_org_rocksdb_DBOptions_maxBackgroundFlushes(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_background_flushes;
 }
 
 /*
@@ -5058,12 +5279,10 @@ jint Java_org_rocksdb_DBOptions_maxBackgroundFlushes(JNIEnv* /*env*/,
  * Method:    setMaxBackgroundJobs
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxBackgroundJobs(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle,
-                                                     jint max_background_jobs) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_background_jobs =
-      static_cast<int>(max_background_jobs);
+void Java_org_rocksdb_DBOptions_setMaxBackgroundJobs(
+    JNIEnv*, jobject, jlong jhandle, jint max_background_jobs) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_background_jobs = static_cast<int>(max_background_jobs);
 }
 
 /*
@@ -5071,10 +5290,10 @@ void Java_org_rocksdb_DBOptions_setMaxBackgroundJobs(JNIEnv* /*env*/,
  * Method:    maxBackgroundJobs
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxBackgroundJobs(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_background_jobs;
+jint Java_org_rocksdb_DBOptions_maxBackgroundJobs(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_background_jobs;
 }
 
 /*
@@ -5082,16 +5301,15 @@ jint Java_org_rocksdb_DBOptions_maxBackgroundJobs(JNIEnv* /*env*/,
  * Method:    setMaxLogFileSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setMaxLogFileSize(JNIEnv* env,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jlong max_log_file_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(max_log_file_size);
+void Java_org_rocksdb_DBOptions_setMaxLogFileSize(
+    JNIEnv* env, jobject, jlong jhandle, jlong max_log_file_size) {
+  auto s =
+      ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(max_log_file_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_log_file_size =
-        max_log_file_size;
+    reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+        ->max_log_file_size = max_log_file_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -5100,10 +5318,10 @@ void Java_org_rocksdb_DBOptions_setMaxLogFileSize(JNIEnv* env,
  * Method:    maxLogFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_maxLogFileSize(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_log_file_size;
+jlong Java_org_rocksdb_DBOptions_maxLogFileSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_log_file_size;
 }
 
 /*
@@ -5112,15 +5330,14 @@ jlong Java_org_rocksdb_DBOptions_maxLogFileSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setLogFileTimeToRoll(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong log_file_time_to_roll) {
-  rocksdb::Status s =
-      rocksdb::check_if_jlong_fits_size_t(log_file_time_to_roll);
+    JNIEnv* env, jobject, jlong jhandle, jlong log_file_time_to_roll) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      log_file_time_to_roll);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::DBOptions*>(jhandle)->log_file_time_to_roll =
-        log_file_time_to_roll;
+    reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+        ->log_file_time_to_roll = log_file_time_to_roll;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -5129,10 +5346,10 @@ void Java_org_rocksdb_DBOptions_setLogFileTimeToRoll(
  * Method:    logFileTimeToRoll
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_logFileTimeToRoll(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->log_file_time_to_roll;
+jlong Java_org_rocksdb_DBOptions_logFileTimeToRoll(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->log_file_time_to_roll;
 }
 
 /*
@@ -5140,16 +5357,15 @@ jlong Java_org_rocksdb_DBOptions_logFileTimeToRoll(JNIEnv* /*env*/,
  * Method:    setKeepLogFileNum
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setKeepLogFileNum(JNIEnv* env,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jlong keep_log_file_num) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(keep_log_file_num);
+void Java_org_rocksdb_DBOptions_setKeepLogFileNum(
+    JNIEnv* env, jobject, jlong jhandle, jlong keep_log_file_num) {
+  auto s =
+      ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(keep_log_file_num);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::DBOptions*>(jhandle)->keep_log_file_num =
-        keep_log_file_num;
+    reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+        ->keep_log_file_num = keep_log_file_num;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -5158,10 +5374,10 @@ void Java_org_rocksdb_DBOptions_setKeepLogFileNum(JNIEnv* env,
  * Method:    keepLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_keepLogFileNum(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->keep_log_file_num;
+jlong Java_org_rocksdb_DBOptions_keepLogFileNum(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->keep_log_file_num;
 }
 
 /*
@@ -5170,14 +5386,14 @@ jlong Java_org_rocksdb_DBOptions_keepLogFileNum(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setRecycleLogFileNum(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong recycle_log_file_num) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(recycle_log_file_num);
+    JNIEnv* env, jobject, jlong jhandle, jlong recycle_log_file_num) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      recycle_log_file_num);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::DBOptions*>(jhandle)->recycle_log_file_num =
-        recycle_log_file_num;
+    reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+        ->recycle_log_file_num = recycle_log_file_num;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -5186,10 +5402,10 @@ void Java_org_rocksdb_DBOptions_setRecycleLogFileNum(
  * Method:    recycleLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_recycleLogFileNum(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->recycle_log_file_num;
+jlong Java_org_rocksdb_DBOptions_recycleLogFileNum(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->recycle_log_file_num;
 }
 
 /*
@@ -5198,10 +5414,9 @@ jlong Java_org_rocksdb_DBOptions_recycleLogFileNum(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setMaxManifestFileSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong max_manifest_file_size) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_manifest_file_size =
-      static_cast<int64_t>(max_manifest_file_size);
+    JNIEnv*, jobject, jlong jhandle, jlong max_manifest_file_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_manifest_file_size = static_cast<int64_t>(max_manifest_file_size);
 }
 
 /*
@@ -5209,10 +5424,10 @@ void Java_org_rocksdb_DBOptions_setMaxManifestFileSize(
  * Method:    maxManifestFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_maxManifestFileSize(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->max_manifest_file_size;
+jlong Java_org_rocksdb_DBOptions_maxManifestFileSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->max_manifest_file_size;
 }
 
 /*
@@ -5221,10 +5436,9 @@ jlong Java_org_rocksdb_DBOptions_maxManifestFileSize(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_DBOptions_setTableCacheNumshardbits(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint table_cache_numshardbits) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->table_cache_numshardbits =
-      static_cast<int>(table_cache_numshardbits);
+    JNIEnv*, jobject, jlong jhandle, jint table_cache_numshardbits) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->table_cache_numshardbits = static_cast<int>(table_cache_numshardbits);
 }
 
 /*
@@ -5232,10 +5446,9 @@ void Java_org_rocksdb_DBOptions_setTableCacheNumshardbits(
  * Method:    tableCacheNumshardbits
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->table_cache_numshardbits;
 }
 
@@ -5244,11 +5457,9 @@ jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(JNIEnv* /*env*/,
  * Method:    setWalTtlSeconds
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalTtlSeconds(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle,
-                                                 jlong WAL_ttl_seconds) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->WAL_ttl_seconds =
+void Java_org_rocksdb_DBOptions_setWalTtlSeconds(
+    JNIEnv*, jobject, jlong jhandle, jlong WAL_ttl_seconds) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->WAL_ttl_seconds =
       static_cast<int64_t>(WAL_ttl_seconds);
 }
 
@@ -5257,10 +5468,10 @@ void Java_org_rocksdb_DBOptions_setWalTtlSeconds(JNIEnv* /*env*/,
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_walTtlSeconds(JNIEnv* /*env*/,
-                                               jobject /*jobj*/,
-                                               jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->WAL_ttl_seconds;
+jlong Java_org_rocksdb_DBOptions_walTtlSeconds(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->WAL_ttl_seconds;
 }
 
 /*
@@ -5268,11 +5479,9 @@ jlong Java_org_rocksdb_DBOptions_walTtlSeconds(JNIEnv* /*env*/,
  * Method:    setWalSizeLimitMB
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalSizeLimitMB(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jlong WAL_size_limit_MB) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->WAL_size_limit_MB =
+void Java_org_rocksdb_DBOptions_setWalSizeLimitMB(
+    JNIEnv*, jobject, jlong jhandle, jlong WAL_size_limit_MB) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->WAL_size_limit_MB =
       static_cast<int64_t>(WAL_size_limit_MB);
 }
 
@@ -5281,10 +5490,10 @@ void Java_org_rocksdb_DBOptions_setWalSizeLimitMB(JNIEnv* /*env*/,
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_walSizeLimitMB(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->WAL_size_limit_MB;
+jlong Java_org_rocksdb_DBOptions_walSizeLimitMB(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->WAL_size_limit_MB;
 }
 
 /*
@@ -5293,14 +5502,14 @@ jlong Java_org_rocksdb_DBOptions_walSizeLimitMB(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setManifestPreallocationSize(
-    JNIEnv* env, jobject /*jobj*/, jlong jhandle,
-    jlong preallocation_size) {
-  rocksdb::Status s = rocksdb::check_if_jlong_fits_size_t(preallocation_size);
+    JNIEnv* env, jobject, jlong jhandle, jlong preallocation_size) {
+  auto s = ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
+      preallocation_size);
   if (s.ok()) {
-    reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
         ->manifest_preallocation_size = preallocation_size;
   } else {
-    rocksdb::IllegalArgumentExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -5309,10 +5518,9 @@ void Java_org_rocksdb_DBOptions_setManifestPreallocationSize(
  * Method:    manifestPreallocationSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_manifestPreallocationSize(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+jlong Java_org_rocksdb_DBOptions_manifestPreallocationSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->manifest_preallocation_size;
 }
 
@@ -5321,10 +5529,10 @@ jlong Java_org_rocksdb_DBOptions_manifestPreallocationSize(JNIEnv* /*env*/,
  * Method:    useDirectReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_useDirectReads(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->use_direct_reads;
+jboolean Java_org_rocksdb_DBOptions_useDirectReads(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->use_direct_reads;
 }
 
 /*
@@ -5332,11 +5540,9 @@ jboolean Java_org_rocksdb_DBOptions_useDirectReads(JNIEnv* /*env*/,
  * Method:    setUseDirectReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setUseDirectReads(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jboolean use_direct_reads) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->use_direct_reads =
+void Java_org_rocksdb_DBOptions_setUseDirectReads(
+    JNIEnv*, jobject, jlong jhandle, jboolean use_direct_reads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->use_direct_reads =
       static_cast<bool>(use_direct_reads);
 }
 
@@ -5346,8 +5552,8 @@ void Java_org_rocksdb_DBOptions_setUseDirectReads(JNIEnv* /*env*/,
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_DBOptions_useDirectIoForFlushAndCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->use_direct_io_for_flush_and_compaction;
 }
 
@@ -5357,9 +5563,9 @@ jboolean Java_org_rocksdb_DBOptions_useDirectIoForFlushAndCompaction(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setUseDirectIoForFlushAndCompaction(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean use_direct_io_for_flush_and_compaction) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->use_direct_io_for_flush_and_compaction =
       static_cast<bool>(use_direct_io_for_flush_and_compaction);
 }
@@ -5369,11 +5575,9 @@ void Java_org_rocksdb_DBOptions_setUseDirectIoForFlushAndCompaction(
  * Method:    setAllowFAllocate
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllowFAllocate(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jboolean jallow_fallocate) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->allow_fallocate =
+void Java_org_rocksdb_DBOptions_setAllowFAllocate(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_fallocate) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->allow_fallocate =
       static_cast<bool>(jallow_fallocate);
 }
 
@@ -5382,10 +5586,9 @@ void Java_org_rocksdb_DBOptions_setAllowFAllocate(JNIEnv* /*env*/,
  * Method:    allowFAllocate
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowFAllocate(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_allowFAllocate(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->allow_fallocate);
 }
 
@@ -5394,11 +5597,9 @@ jboolean Java_org_rocksdb_DBOptions_allowFAllocate(JNIEnv* /*env*/,
  * Method:    setAllowMmapReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllowMmapReads(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle,
-                                                  jboolean allow_mmap_reads) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->allow_mmap_reads =
+void Java_org_rocksdb_DBOptions_setAllowMmapReads(
+    JNIEnv*, jobject, jlong jhandle, jboolean allow_mmap_reads) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->allow_mmap_reads =
       static_cast<bool>(allow_mmap_reads);
 }
 
@@ -5407,10 +5608,10 @@ void Java_org_rocksdb_DBOptions_setAllowMmapReads(JNIEnv* /*env*/,
  * Method:    allowMmapReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowMmapReads(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->allow_mmap_reads;
+jboolean Java_org_rocksdb_DBOptions_allowMmapReads(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->allow_mmap_reads;
 }
 
 /*
@@ -5418,11 +5619,9 @@ jboolean Java_org_rocksdb_DBOptions_allowMmapReads(JNIEnv* /*env*/,
  * Method:    setAllowMmapWrites
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllowMmapWrites(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jboolean allow_mmap_writes) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->allow_mmap_writes =
+void Java_org_rocksdb_DBOptions_setAllowMmapWrites(
+    JNIEnv*, jobject, jlong jhandle, jboolean allow_mmap_writes) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->allow_mmap_writes =
       static_cast<bool>(allow_mmap_writes);
 }
 
@@ -5431,10 +5630,10 @@ void Java_org_rocksdb_DBOptions_setAllowMmapWrites(JNIEnv* /*env*/,
  * Method:    allowMmapWrites
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowMmapWrites(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->allow_mmap_writes;
+jboolean Java_org_rocksdb_DBOptions_allowMmapWrites(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->allow_mmap_writes;
 }
 
 /*
@@ -5443,10 +5642,9 @@ jboolean Java_org_rocksdb_DBOptions_allowMmapWrites(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setIsFdCloseOnExec(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean is_fd_close_on_exec) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->is_fd_close_on_exec =
-      static_cast<bool>(is_fd_close_on_exec);
+    JNIEnv*, jobject, jlong jhandle, jboolean is_fd_close_on_exec) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->is_fd_close_on_exec = static_cast<bool>(is_fd_close_on_exec);
 }
 
 /*
@@ -5454,10 +5652,10 @@ void Java_org_rocksdb_DBOptions_setIsFdCloseOnExec(
  * Method:    isFdCloseOnExec
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_isFdCloseOnExec(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->is_fd_close_on_exec;
+jboolean Java_org_rocksdb_DBOptions_isFdCloseOnExec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->is_fd_close_on_exec;
 }
 
 /*
@@ -5466,10 +5664,10 @@ jboolean Java_org_rocksdb_DBOptions_isFdCloseOnExec(JNIEnv* /*env*/,
  * Signature: (JI)V
  */
 void Java_org_rocksdb_DBOptions_setStatsDumpPeriodSec(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jint stats_dump_period_sec) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->stats_dump_period_sec =
-      static_cast<int>(stats_dump_period_sec);
+    JNIEnv*, jobject, jlong jhandle, jint jstats_dump_period_sec) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->stats_dump_period_sec =
+      static_cast<unsigned int>(jstats_dump_period_sec);
 }
 
 /*
@@ -5477,10 +5675,56 @@ void Java_org_rocksdb_DBOptions_setStatsDumpPeriodSec(
  * Method:    statsDumpPeriodSec
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_statsDumpPeriodSec(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->stats_dump_period_sec;
+jint Java_org_rocksdb_DBOptions_statsDumpPeriodSec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->stats_dump_period_sec;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setStatsPersistPeriodSec
+ * Signature: (JI)V
+ */
+void Java_org_rocksdb_DBOptions_setStatsPersistPeriodSec(
+    JNIEnv*, jobject, jlong jhandle, jint jstats_persist_period_sec) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->stats_persist_period_sec =
+      static_cast<unsigned int>(jstats_persist_period_sec);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    statsPersistPeriodSec
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_DBOptions_statsPersistPeriodSec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->stats_persist_period_sec;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setStatsHistoryBufferSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_DBOptions_setStatsHistoryBufferSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jstats_history_buffer_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->stats_history_buffer_size =
+      static_cast<size_t>(jstats_history_buffer_size);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    statsHistoryBufferSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_DBOptions_statsHistoryBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->stats_history_buffer_size;
 }
 
 /*
@@ -5489,10 +5733,9 @@ jint Java_org_rocksdb_DBOptions_statsDumpPeriodSec(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setAdviseRandomOnOpen(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean advise_random_on_open) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->advise_random_on_open =
-      static_cast<bool>(advise_random_on_open);
+    JNIEnv*, jobject, jlong jhandle, jboolean advise_random_on_open) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->advise_random_on_open = static_cast<bool>(advise_random_on_open);
 }
 
 /*
@@ -5500,10 +5743,10 @@ void Java_org_rocksdb_DBOptions_setAdviseRandomOnOpen(
  * Method:    adviseRandomOnOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_adviseRandomOnOpen(JNIEnv* /*env*/,
-                                                       jobject /*jobj*/,
-                                                       jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->advise_random_on_open;
+jboolean Java_org_rocksdb_DBOptions_adviseRandomOnOpen(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->advise_random_on_open;
 }
 
 /*
@@ -5512,21 +5755,34 @@ jboolean Java_org_rocksdb_DBOptions_adviseRandomOnOpen(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setDbWriteBufferSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jdb_write_buffer_size) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jlong jdb_write_buffer_size) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->db_write_buffer_size = static_cast<size_t>(jdb_write_buffer_size);
 }
 
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setWriteBufferManager
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_DBOptions_setWriteBufferManager(
+    JNIEnv*, jobject, jlong jdb_options_handle,
+    jlong jwrite_buffer_manager_handle) {
+  auto* write_buffer_manager =
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::WriteBufferManager>*>(
+          jwrite_buffer_manager_handle);
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jdb_options_handle)
+      ->write_buffer_manager = *write_buffer_manager;
+}
+
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    dbWriteBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_dbWriteBufferSize(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_dbWriteBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->db_write_buffer_size);
 }
 
@@ -5536,11 +5792,10 @@ jlong Java_org_rocksdb_DBOptions_dbWriteBufferSize(JNIEnv* /*env*/,
  * Signature: (JB)V
  */
 void Java_org_rocksdb_DBOptions_setAccessHintOnCompactionStart(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jaccess_hint_value) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jbyte jaccess_hint_value) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->access_hint_on_compaction_start =
-      rocksdb::AccessHintJni::toCppAccessHint(jaccess_hint_value);
+      ROCKSDB_NAMESPACE::AccessHintJni::toCppAccessHint(jaccess_hint_value);
 }
 
 /*
@@ -5548,11 +5803,10 @@ void Java_org_rocksdb_DBOptions_setAccessHintOnCompactionStart(
  * Method:    accessHintOnCompactionStart
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_DBOptions_accessHintOnCompactionStart(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  return rocksdb::AccessHintJni::toJavaAccessHint(
+jbyte Java_org_rocksdb_DBOptions_accessHintOnCompactionStart(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::AccessHintJni::toJavaAccessHint(
       opt->access_hint_on_compaction_start);
 }
 
@@ -5562,9 +5816,9 @@ jbyte Java_org_rocksdb_DBOptions_accessHintOnCompactionStart(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setNewTableReaderForCompactionInputs(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean jnew_table_reader_for_compaction_inputs) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->new_table_reader_for_compaction_inputs =
       static_cast<bool>(jnew_table_reader_for_compaction_inputs);
 }
@@ -5575,8 +5829,8 @@ void Java_org_rocksdb_DBOptions_setNewTableReaderForCompactionInputs(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_DBOptions_newTableReaderForCompactionInputs(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<bool>(opt->new_table_reader_for_compaction_inputs);
 }
 
@@ -5586,9 +5840,8 @@ jboolean Java_org_rocksdb_DBOptions_newTableReaderForCompactionInputs(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setCompactionReadaheadSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jcompaction_readahead_size) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jlong jcompaction_readahead_size) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->compaction_readahead_size =
       static_cast<size_t>(jcompaction_readahead_size);
 }
@@ -5598,10 +5851,9 @@ void Java_org_rocksdb_DBOptions_setCompactionReadaheadSize(
  * Method:    compactionReadaheadSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_compactionReadaheadSize(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_compactionReadaheadSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->compaction_readahead_size);
 }
 
@@ -5611,9 +5863,8 @@ jlong Java_org_rocksdb_DBOptions_compactionReadaheadSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setRandomAccessMaxBufferSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jrandom_access_max_buffer_size) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jlong jrandom_access_max_buffer_size) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->random_access_max_buffer_size =
       static_cast<size_t>(jrandom_access_max_buffer_size);
 }
@@ -5623,10 +5874,9 @@ void Java_org_rocksdb_DBOptions_setRandomAccessMaxBufferSize(
  * Method:    randomAccessMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_randomAccessMaxBufferSize(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_randomAccessMaxBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->random_access_max_buffer_size);
 }
 
@@ -5636,9 +5886,8 @@ jlong Java_org_rocksdb_DBOptions_randomAccessMaxBufferSize(JNIEnv* /*env*/,
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setWritableFileMaxBufferSize(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jwritable_file_max_buffer_size) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jlong jwritable_file_max_buffer_size) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->writable_file_max_buffer_size =
       static_cast<size_t>(jwritable_file_max_buffer_size);
 }
@@ -5648,10 +5897,9 @@ void Java_org_rocksdb_DBOptions_setWritableFileMaxBufferSize(
  * Method:    writableFileMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_writableFileMaxBufferSize(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_writableFileMaxBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->writable_file_max_buffer_size);
 }
 
@@ -5661,9 +5909,8 @@ jlong Java_org_rocksdb_DBOptions_writableFileMaxBufferSize(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setUseAdaptiveMutex(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean use_adaptive_mutex) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->use_adaptive_mutex =
+    JNIEnv*, jobject, jlong jhandle, jboolean use_adaptive_mutex) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->use_adaptive_mutex =
       static_cast<bool>(use_adaptive_mutex);
 }
 
@@ -5672,10 +5919,10 @@ void Java_org_rocksdb_DBOptions_setUseAdaptiveMutex(
  * Method:    useAdaptiveMutex
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_useAdaptiveMutex(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->use_adaptive_mutex;
+jboolean Java_org_rocksdb_DBOptions_useAdaptiveMutex(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->use_adaptive_mutex;
 }
 
 /*
@@ -5683,10 +5930,9 @@ jboolean Java_org_rocksdb_DBOptions_useAdaptiveMutex(JNIEnv* /*env*/,
  * Method:    setBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setBytesPerSync(JNIEnv* /*env*/,
-                                                jobject /*jobj*/, jlong jhandle,
-                                                jlong bytes_per_sync) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->bytes_per_sync =
+void Java_org_rocksdb_DBOptions_setBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle, jlong bytes_per_sync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->bytes_per_sync =
       static_cast<int64_t>(bytes_per_sync);
 }
 
@@ -5695,9 +5941,10 @@ void Java_org_rocksdb_DBOptions_setBytesPerSync(JNIEnv* /*env*/,
  * Method:    bytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_bytesPerSync(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->bytes_per_sync;
+jlong Java_org_rocksdb_DBOptions_bytesPerSync(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->bytes_per_sync;
 }
 
 /*
@@ -5705,11 +5952,9 @@ jlong Java_org_rocksdb_DBOptions_bytesPerSync(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setWalBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalBytesPerSync(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jlong jwal_bytes_per_sync) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->wal_bytes_per_sync =
+void Java_org_rocksdb_DBOptions_setWalBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle, jlong jwal_bytes_per_sync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->wal_bytes_per_sync =
       static_cast<int64_t>(jwal_bytes_per_sync);
 }
 
@@ -5718,35 +5963,33 @@ void Java_org_rocksdb_DBOptions_setWalBytesPerSync(JNIEnv* /*env*/,
  * Method:    walBytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_walBytesPerSync(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_walBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->wal_bytes_per_sync);
 }
 
 /*
  * Class:     org_rocksdb_DBOptions
- * Method:    setEnableThreadTracking
+ * Method:    setStrictBytesPerSync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setEnableThreadTracking(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jenable_thread_tracking) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  opt->enable_thread_tracking = static_cast<bool>(jenable_thread_tracking);
+void Java_org_rocksdb_DBOptions_setStrictBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle, jboolean jstrict_bytes_per_sync) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->strict_bytes_per_sync = jstrict_bytes_per_sync == JNI_TRUE;
 }
 
 /*
  * Class:     org_rocksdb_DBOptions
- * Method:    enableThreadTracking
+ * Method:    strictBytesPerSync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_enableThreadTracking(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  return static_cast<jboolean>(opt->enable_thread_tracking);
+jboolean Java_org_rocksdb_DBOptions_strictBytesPerSync(
+    JNIEnv*, jobject, jlong jhandle) {
+  return static_cast<jboolean>(
+      reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+          ->strict_bytes_per_sync);
 }
 
 /*
@@ -5754,11 +5997,9 @@ jboolean Java_org_rocksdb_DBOptions_enableThreadTracking(JNIEnv* /*env*/,
  * Method:    setDelayedWriteRate
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setDelayedWriteRate(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle,
-                                                    jlong jdelayed_write_rate) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+void Java_org_rocksdb_DBOptions_setDelayedWriteRate(
+    JNIEnv*, jobject, jlong jhandle, jlong jdelayed_write_rate) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->delayed_write_rate = static_cast<uint64_t>(jdelayed_write_rate);
 }
 
@@ -5767,21 +6008,87 @@ void Java_org_rocksdb_DBOptions_setDelayedWriteRate(JNIEnv* /*env*/,
  * Method:    delayedWriteRate
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_delayedWriteRate(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jlong Java_org_rocksdb_DBOptions_delayedWriteRate(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jlong>(opt->delayed_write_rate);
 }
 
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setEnablePipelinedWrite
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setEnablePipelinedWrite(
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_pipelined_write) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->enable_pipelined_write = jenable_pipelined_write == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    enablePipelinedWrite
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_enablePipelinedWrite(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->enable_pipelined_write);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setUnorderedWrite
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setUnorderedWrite(
+        JNIEnv*, jobject, jlong jhandle, jboolean junordered_write) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->unordered_write = junordered_write == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    unorderedWrite
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_unorderedWrite(
+        JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->unordered_write);
+}
+
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setEnableThreadTracking
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setEnableThreadTracking(
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_thread_tracking) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->enable_thread_tracking = jenable_thread_tracking == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    enableThreadTracking
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_enableThreadTracking(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->enable_thread_tracking);
+}
+
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setAllowConcurrentMemtableWrite
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setAllowConcurrentMemtableWrite(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jboolean allow) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean allow) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->allow_concurrent_memtable_write = static_cast<bool>(allow);
 }
 
@@ -5791,8 +6098,8 @@ void Java_org_rocksdb_DBOptions_setAllowConcurrentMemtableWrite(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_DBOptions_allowConcurrentMemtableWrite(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->allow_concurrent_memtable_write;
 }
 
@@ -5802,8 +6109,8 @@ jboolean Java_org_rocksdb_DBOptions_allowConcurrentMemtableWrite(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setEnableWriteThreadAdaptiveYield(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle, jboolean yield) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle, jboolean yield) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->enable_write_thread_adaptive_yield = static_cast<bool>(yield);
 }
 
@@ -5813,8 +6120,8 @@ void Java_org_rocksdb_DBOptions_setEnableWriteThreadAdaptiveYield(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_DBOptions_enableWriteThreadAdaptiveYield(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->enable_write_thread_adaptive_yield;
 }
 
@@ -5823,12 +6130,10 @@ jboolean Java_org_rocksdb_DBOptions_enableWriteThreadAdaptiveYield(
  * Method:    setWriteThreadMaxYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWriteThreadMaxYieldUsec(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle,
-                                                           jlong max) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->write_thread_max_yield_usec =
-      static_cast<int64_t>(max);
+void Java_org_rocksdb_DBOptions_setWriteThreadMaxYieldUsec(
+    JNIEnv*, jobject, jlong jhandle, jlong max) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->write_thread_max_yield_usec = static_cast<int64_t>(max);
 }
 
 /*
@@ -5836,10 +6141,9 @@ void Java_org_rocksdb_DBOptions_setWriteThreadMaxYieldUsec(JNIEnv* /*env*/,
  * Method:    writeThreadMaxYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_writeThreadMaxYieldUsec(JNIEnv* /*env*/,
-                                                         jobject /*jobj*/,
-                                                         jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+jlong Java_org_rocksdb_DBOptions_writeThreadMaxYieldUsec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->write_thread_max_yield_usec;
 }
 
@@ -5848,12 +6152,10 @@ jlong Java_org_rocksdb_DBOptions_writeThreadMaxYieldUsec(JNIEnv* /*env*/,
  * Method:    setWriteThreadSlowYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWriteThreadSlowYieldUsec(JNIEnv* /*env*/,
-                                                            jobject /*jobj*/,
-                                                            jlong jhandle,
-                                                            jlong slow) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->write_thread_slow_yield_usec =
-      static_cast<int64_t>(slow);
+void Java_org_rocksdb_DBOptions_setWriteThreadSlowYieldUsec(
+    JNIEnv*, jobject, jlong jhandle, jlong slow) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
+      ->write_thread_slow_yield_usec = static_cast<int64_t>(slow);
 }
 
 /*
@@ -5861,10 +6163,9 @@ void Java_org_rocksdb_DBOptions_setWriteThreadSlowYieldUsec(JNIEnv* /*env*/,
  * Method:    writeThreadSlowYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_writeThreadSlowYieldUsec(JNIEnv* /*env*/,
-                                                          jobject /*jobj*/,
-                                                          jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
+jlong Java_org_rocksdb_DBOptions_writeThreadSlowYieldUsec(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->write_thread_slow_yield_usec;
 }
 
@@ -5874,9 +6175,8 @@ jlong Java_org_rocksdb_DBOptions_writeThreadSlowYieldUsec(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setSkipStatsUpdateOnDbOpen(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jskip_stats_update_on_db_open) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jskip_stats_update_on_db_open) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->skip_stats_update_on_db_open =
       static_cast<bool>(jskip_stats_update_on_db_open);
 }
@@ -5886,24 +6186,47 @@ void Java_org_rocksdb_DBOptions_setSkipStatsUpdateOnDbOpen(
  * Method:    skipStatsUpdateOnDbOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_skipStatsUpdateOnDbOpen(JNIEnv* /*env*/,
-                                                            jobject /*jobj*/,
-                                                            jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_skipStatsUpdateOnDbOpen(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->skip_stats_update_on_db_open);
 }
 
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setSkipCheckingSstFileSizesOnDbOpen
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setSkipCheckingSstFileSizesOnDbOpen(
+    JNIEnv*, jobject, jlong jhandle,
+    jboolean jskip_checking_sst_file_sizes_on_db_open) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->skip_checking_sst_file_sizes_on_db_open =
+      static_cast<bool>(jskip_checking_sst_file_sizes_on_db_open);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    skipCheckingSstFileSizesOnDbOpen
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_skipCheckingSstFileSizesOnDbOpen(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->skip_checking_sst_file_sizes_on_db_open);
+}
+
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setWalRecoveryMode
  * Signature: (JB)V
  */
 void Java_org_rocksdb_DBOptions_setWalRecoveryMode(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jbyte jwal_recovery_mode_value) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  opt->wal_recovery_mode = rocksdb::WALRecoveryModeJni::toCppWALRecoveryMode(
-      jwal_recovery_mode_value);
+    JNIEnv*, jobject, jlong jhandle, jbyte jwal_recovery_mode_value) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->wal_recovery_mode =
+      ROCKSDB_NAMESPACE::WALRecoveryModeJni::toCppWALRecoveryMode(
+          jwal_recovery_mode_value);
 }
 
 /*
@@ -5911,11 +6234,10 @@ void Java_org_rocksdb_DBOptions_setWalRecoveryMode(
  * Method:    walRecoveryMode
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_DBOptions_walRecoveryMode(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
-  return rocksdb::WALRecoveryModeJni::toJavaWALRecoveryMode(
+jbyte Java_org_rocksdb_DBOptions_walRecoveryMode(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::WALRecoveryModeJni::toJavaWALRecoveryMode(
       opt->wal_recovery_mode);
 }
 
@@ -5924,10 +6246,9 @@ jbyte Java_org_rocksdb_DBOptions_walRecoveryMode(JNIEnv* /*env*/,
  * Method:    setAllow2pc
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle,
-                                            jboolean jallow_2pc) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+void Java_org_rocksdb_DBOptions_setAllow2pc(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_2pc) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->allow_2pc = static_cast<bool>(jallow_2pc);
 }
 
@@ -5936,9 +6257,9 @@ void Java_org_rocksdb_DBOptions_setAllow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    allow2pc
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_allow2pc(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->allow_2pc);
 }
 
@@ -5947,24 +6268,36 @@ jboolean Java_org_rocksdb_DBOptions_allow2pc(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setRowCache
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setRowCache(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle,
-                                            jlong jrow_cache_handle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+void Java_org_rocksdb_DBOptions_setRowCache(
+    JNIEnv*, jobject, jlong jhandle, jlong jrow_cache_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   auto* row_cache =
-      reinterpret_cast<std::shared_ptr<rocksdb::Cache>*>(jrow_cache_handle);
+      reinterpret_cast<std::shared_ptr<ROCKSDB_NAMESPACE::Cache>*>(
+          jrow_cache_handle);
   opt->row_cache = *row_cache;
 }
 
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setWalFilter
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_DBOptions_setWalFilter(
+    JNIEnv*, jobject, jlong jhandle, jlong jwal_filter_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  auto* wal_filter = reinterpret_cast<ROCKSDB_NAMESPACE::WalFilterJniCallback*>(
+      jwal_filter_handle);
+  opt->wal_filter = wal_filter;
+}
+
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setFailIfOptionsFileError
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setFailIfOptionsFileError(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jfail_if_options_file_error) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jfail_if_options_file_error) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->fail_if_options_file_error =
       static_cast<bool>(jfail_if_options_file_error);
 }
@@ -5974,10 +6307,9 @@ void Java_org_rocksdb_DBOptions_setFailIfOptionsFileError(
  * Method:    failIfOptionsFileError
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_failIfOptionsFileError(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_failIfOptionsFileError(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->fail_if_options_file_error);
 }
 
@@ -5987,9 +6319,8 @@ jboolean Java_org_rocksdb_DBOptions_failIfOptionsFileError(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setDumpMallocStats(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jdump_malloc_stats) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jdump_malloc_stats) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->dump_malloc_stats = static_cast<bool>(jdump_malloc_stats);
 }
 
@@ -5998,10 +6329,9 @@ void Java_org_rocksdb_DBOptions_setDumpMallocStats(
  * Method:    dumpMallocStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_dumpMallocStats(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_dumpMallocStats(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->dump_malloc_stats);
 }
 
@@ -6011,9 +6341,8 @@ jboolean Java_org_rocksdb_DBOptions_dumpMallocStats(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setAvoidFlushDuringRecovery(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean javoid_flush_during_recovery) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean javoid_flush_during_recovery) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->avoid_flush_during_recovery =
       static_cast<bool>(javoid_flush_during_recovery);
 }
@@ -6023,22 +6352,130 @@ void Java_org_rocksdb_DBOptions_setAvoidFlushDuringRecovery(
  * Method:    avoidFlushDuringRecovery
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_avoidFlushDuringRecovery(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_avoidFlushDuringRecovery(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->avoid_flush_during_recovery);
 }
 
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setAllowIngestBehind
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setAllowIngestBehind(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_ingest_behind) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->allow_ingest_behind = jallow_ingest_behind == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    allowIngestBehind
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_allowIngestBehind(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->allow_ingest_behind);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setPreserveDeletes
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setPreserveDeletes(
+    JNIEnv*, jobject, jlong jhandle, jboolean jpreserve_deletes) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->preserve_deletes = jpreserve_deletes == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    preserveDeletes
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_preserveDeletes(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->preserve_deletes);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setTwoWriteQueues
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setTwoWriteQueues(
+    JNIEnv*, jobject, jlong jhandle, jboolean jtwo_write_queues) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->two_write_queues = jtwo_write_queues == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    twoWriteQueues
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_twoWriteQueues(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->two_write_queues);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setManualWalFlush
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setManualWalFlush(
+    JNIEnv*, jobject, jlong jhandle, jboolean jmanual_wal_flush) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->manual_wal_flush = jmanual_wal_flush == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    manualWalFlush
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_manualWalFlush(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->manual_wal_flush);
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    setAtomicFlush
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_DBOptions_setAtomicFlush(
+    JNIEnv*, jobject, jlong jhandle, jboolean jatomic_flush) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  opt->atomic_flush = jatomic_flush == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_DBOptions
+ * Method:    atomicFlush
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_DBOptions_atomicFlush(
+    JNIEnv *, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
+  return static_cast<jboolean>(opt->atomic_flush);
+}
+
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setAvoidFlushDuringShutdown
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_DBOptions_setAvoidFlushDuringShutdown(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean javoid_flush_during_shutdown) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean javoid_flush_during_shutdown) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   opt->avoid_flush_during_shutdown =
       static_cast<bool>(javoid_flush_during_shutdown);
 }
@@ -6048,24 +6485,23 @@ void Java_org_rocksdb_DBOptions_setAvoidFlushDuringShutdown(
  * Method:    avoidFlushDuringShutdown
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_avoidFlushDuringShutdown(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::DBOptions*>(jhandle);
+jboolean Java_org_rocksdb_DBOptions_avoidFlushDuringShutdown(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
   return static_cast<jboolean>(opt->avoid_flush_during_shutdown);
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// rocksdb::WriteOptions
+// ROCKSDB_NAMESPACE::WriteOptions
 
 /*
  * Class:     org_rocksdb_WriteOptions
  * Method:    newWriteOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_WriteOptions_newWriteOptions(JNIEnv* /*env*/,
-                                                    jclass /*jcls*/) {
-  auto* op = new rocksdb::WriteOptions();
+jlong Java_org_rocksdb_WriteOptions_newWriteOptions(
+    JNIEnv*, jclass) {
+  auto* op = new ROCKSDB_NAMESPACE::WriteOptions();
   return reinterpret_cast<jlong>(op);
 }
 
@@ -6074,11 +6510,10 @@ jlong Java_org_rocksdb_WriteOptions_newWriteOptions(JNIEnv* /*env*/,
  * Method:    copyWriteOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_WriteOptions_copyWriteOptions(JNIEnv* /*env*/,
-                                                     jclass /*jcls*/,
-                                                     jlong jhandle) {
-  auto new_opt = new rocksdb::WriteOptions(
-      *(reinterpret_cast<rocksdb::WriteOptions*>(jhandle)));
+jlong Java_org_rocksdb_WriteOptions_copyWriteOptions(
+    JNIEnv*, jclass, jlong jhandle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::WriteOptions(
+      *(reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)));
   return reinterpret_cast<jlong>(new_opt);
 }
 
@@ -6087,10 +6522,10 @@ jlong Java_org_rocksdb_WriteOptions_copyWriteOptions(JNIEnv* /*env*/,
  * Method:    disposeInternal
  * Signature: ()V
  */
-void Java_org_rocksdb_WriteOptions_disposeInternal(JNIEnv* /*env*/,
-                                                   jobject /*jwrite_options*/,
-                                                   jlong jhandle) {
-  auto* write_options = reinterpret_cast<rocksdb::WriteOptions*>(jhandle);
+void Java_org_rocksdb_WriteOptions_disposeInternal(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* write_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle);
   assert(write_options != nullptr);
   delete write_options;
 }
@@ -6100,10 +6535,9 @@ void Java_org_rocksdb_WriteOptions_disposeInternal(JNIEnv* /*env*/,
  * Method:    setSync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setSync(JNIEnv* /*env*/,
-                                           jobject /*jwrite_options*/,
-                                           jlong jhandle, jboolean jflag) {
-  reinterpret_cast<rocksdb::WriteOptions*>(jhandle)->sync = jflag;
+void Java_org_rocksdb_WriteOptions_setSync(
+    JNIEnv*, jobject, jlong jhandle, jboolean jflag) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->sync = jflag;
 }
 
 /*
@@ -6111,10 +6545,9 @@ void Java_org_rocksdb_WriteOptions_setSync(JNIEnv* /*env*/,
  * Method:    sync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_sync(JNIEnv* /*env*/,
-                                            jobject /*jwrite_options*/,
-                                            jlong jhandle) {
-  return reinterpret_cast<rocksdb::WriteOptions*>(jhandle)->sync;
+jboolean Java_org_rocksdb_WriteOptions_sync(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->sync;
 }
 
 /*
@@ -6122,11 +6555,10 @@ jboolean Java_org_rocksdb_WriteOptions_sync(JNIEnv* /*env*/,
  * Method:    setDisableWAL
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setDisableWAL(JNIEnv* /*env*/,
-                                                 jobject /*jwrite_options*/,
-                                                 jlong jhandle,
-                                                 jboolean jflag) {
-  reinterpret_cast<rocksdb::WriteOptions*>(jhandle)->disableWAL = jflag;
+void Java_org_rocksdb_WriteOptions_setDisableWAL(
+    JNIEnv*, jobject, jlong jhandle, jboolean jflag) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->disableWAL =
+      jflag;
 }
 
 /*
@@ -6134,10 +6566,10 @@ void Java_org_rocksdb_WriteOptions_setDisableWAL(JNIEnv* /*env*/,
  * Method:    disableWAL
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_disableWAL(JNIEnv* /*env*/,
-                                                  jobject /*jwrite_options*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::WriteOptions*>(jhandle)->disableWAL;
+jboolean Java_org_rocksdb_WriteOptions_disableWAL(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
+      ->disableWAL;
 }
 
 /*
@@ -6146,9 +6578,9 @@ jboolean Java_org_rocksdb_WriteOptions_disableWAL(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_WriteOptions_setIgnoreMissingColumnFamilies(
-    JNIEnv* /*env*/, jobject /*jwrite_options*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean jignore_missing_column_families) {
-  reinterpret_cast<rocksdb::WriteOptions*>(jhandle)
+  reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
       ->ignore_missing_column_families =
       static_cast<bool>(jignore_missing_column_families);
 }
@@ -6159,8 +6591,8 @@ void Java_org_rocksdb_WriteOptions_setIgnoreMissingColumnFamilies(
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_WriteOptions_ignoreMissingColumnFamilies(
-    JNIEnv* /*env*/, jobject /*jwrite_options*/, jlong jhandle) {
-  return reinterpret_cast<rocksdb::WriteOptions*>(jhandle)
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
       ->ignore_missing_column_families;
 }
 
@@ -6169,11 +6601,9 @@ jboolean Java_org_rocksdb_WriteOptions_ignoreMissingColumnFamilies(
  * Method:    setNoSlowdown
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setNoSlowdown(JNIEnv* /*env*/,
-                                                 jobject /*jwrite_options*/,
-                                                 jlong jhandle,
-                                                 jboolean jno_slowdown) {
-  reinterpret_cast<rocksdb::WriteOptions*>(jhandle)->no_slowdown =
+void Java_org_rocksdb_WriteOptions_setNoSlowdown(
+    JNIEnv*, jobject, jlong jhandle, jboolean jno_slowdown) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->no_slowdown =
       static_cast<bool>(jno_slowdown);
 }
 
@@ -6182,23 +6612,56 @@ void Java_org_rocksdb_WriteOptions_setNoSlowdown(JNIEnv* /*env*/,
  * Method:    noSlowdown
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_noSlowdown(JNIEnv* /*env*/,
-                                                  jobject /*jwrite_options*/,
-                                                  jlong jhandle) {
-  return reinterpret_cast<rocksdb::WriteOptions*>(jhandle)->no_slowdown;
+jboolean Java_org_rocksdb_WriteOptions_noSlowdown(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
+      ->no_slowdown;
+}
+
+/*
+ * Class:     org_rocksdb_WriteOptions
+ * Method:    setLowPri
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_WriteOptions_setLowPri(
+    JNIEnv*, jobject, jlong jhandle, jboolean jlow_pri) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->low_pri =
+      static_cast<bool>(jlow_pri);
+}
+
+/*
+ * Class:     org_rocksdb_WriteOptions
+ * Method:    lowPri
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_WriteOptions_lowPri(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->low_pri;
 }
 
 /////////////////////////////////////////////////////////////////////
-// rocksdb::ReadOptions
+// ROCKSDB_NAMESPACE::ReadOptions
 
 /*
  * Class:     org_rocksdb_ReadOptions
  * Method:    newReadOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_ReadOptions_newReadOptions(JNIEnv* /*env*/,
-                                                  jclass /*jcls*/) {
-  auto* read_options = new rocksdb::ReadOptions();
+jlong Java_org_rocksdb_ReadOptions_newReadOptions__(
+    JNIEnv*, jclass) {
+  auto* read_options = new ROCKSDB_NAMESPACE::ReadOptions();
+  return reinterpret_cast<jlong>(read_options);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    newReadOptions
+ * Signature: (ZZ)J
+ */
+jlong Java_org_rocksdb_ReadOptions_newReadOptions__ZZ(
+    JNIEnv*, jclass, jboolean jverify_checksums, jboolean jfill_cache) {
+  auto* read_options = new ROCKSDB_NAMESPACE::ReadOptions(
+      static_cast<bool>(jverify_checksums), static_cast<bool>(jfill_cache));
   return reinterpret_cast<jlong>(read_options);
 }
 
@@ -6207,10 +6670,10 @@ jlong Java_org_rocksdb_ReadOptions_newReadOptions(JNIEnv* /*env*/,
  * Method:    copyReadOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_copyReadOptions(JNIEnv* /*env*/, jclass /*jcls*/,
-                                                   jlong jhandle) {
-  auto new_opt = new rocksdb::ReadOptions(
-      *(reinterpret_cast<rocksdb::ReadOptions*>(jhandle)));
+jlong Java_org_rocksdb_ReadOptions_copyReadOptions(
+    JNIEnv*, jclass, jlong jhandle) {
+  auto new_opt = new ROCKSDB_NAMESPACE::ReadOptions(
+      *(reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)));
   return reinterpret_cast<jlong>(new_opt);
 }
 
@@ -6219,10 +6682,10 @@ jlong Java_org_rocksdb_ReadOptions_copyReadOptions(JNIEnv* /*env*/, jclass /*jcl
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_ReadOptions_disposeInternal(JNIEnv* /*env*/,
-                                                  jobject /*jobj*/,
-                                                  jlong jhandle) {
-  auto* read_options = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+void Java_org_rocksdb_ReadOptions_disposeInternal(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* read_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   assert(read_options != nullptr);
   delete read_options;
 }
@@ -6233,9 +6696,8 @@ void Java_org_rocksdb_ReadOptions_disposeInternal(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ReadOptions_setVerifyChecksums(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jverify_checksums) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->verify_checksums =
+    JNIEnv*, jobject, jlong jhandle, jboolean jverify_checksums) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->verify_checksums =
       static_cast<bool>(jverify_checksums);
 }
 
@@ -6244,10 +6706,10 @@ void Java_org_rocksdb_ReadOptions_setVerifyChecksums(
  * Method:    verifyChecksums
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_verifyChecksums(JNIEnv* /*env*/,
-                                                      jobject /*jobj*/,
-                                                      jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->verify_checksums;
+jboolean Java_org_rocksdb_ReadOptions_verifyChecksums(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+      ->verify_checksums;
 }
 
 /*
@@ -6255,10 +6717,9 @@ jboolean Java_org_rocksdb_ReadOptions_verifyChecksums(JNIEnv* /*env*/,
  * Method:    setFillCache
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setFillCache(JNIEnv* /*env*/,
-                                               jobject /*jobj*/, jlong jhandle,
-                                               jboolean jfill_cache) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->fill_cache =
+void Java_org_rocksdb_ReadOptions_setFillCache(
+    JNIEnv*, jobject, jlong jhandle, jboolean jfill_cache) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->fill_cache =
       static_cast<bool>(jfill_cache);
 }
 
@@ -6267,10 +6728,9 @@ void Java_org_rocksdb_ReadOptions_setFillCache(JNIEnv* /*env*/,
  * Method:    fillCache
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_fillCache(JNIEnv* /*env*/,
-                                                jobject /*jobj*/,
-                                                jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->fill_cache;
+jboolean Java_org_rocksdb_ReadOptions_fillCache(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->fill_cache;
 }
 
 /*
@@ -6278,9 +6738,9 @@ jboolean Java_org_rocksdb_ReadOptions_fillCache(JNIEnv* /*env*/,
  * Method:    setTailing
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setTailing(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle, jboolean jtailing) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->tailing =
+void Java_org_rocksdb_ReadOptions_setTailing(
+    JNIEnv*, jobject, jlong jhandle, jboolean jtailing) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->tailing =
       static_cast<bool>(jtailing);
 }
 
@@ -6289,9 +6749,9 @@ void Java_org_rocksdb_ReadOptions_setTailing(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    tailing
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_tailing(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->tailing;
+jboolean Java_org_rocksdb_ReadOptions_tailing(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->tailing;
 }
 
 /*
@@ -6299,9 +6759,9 @@ jboolean Java_org_rocksdb_ReadOptions_tailing(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    managed
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_managed(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->managed;
+jboolean Java_org_rocksdb_ReadOptions_managed(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->managed;
 }
 
 /*
@@ -6309,9 +6769,9 @@ jboolean Java_org_rocksdb_ReadOptions_managed(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setManaged
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setManaged(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle, jboolean jmanaged) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->managed =
+void Java_org_rocksdb_ReadOptions_setManaged(
+    JNIEnv*, jobject, jlong jhandle, jboolean jmanaged) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->managed =
       static_cast<bool>(jmanaged);
 }
 
@@ -6320,10 +6780,10 @@ void Java_org_rocksdb_ReadOptions_setManaged(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    totalOrderSeek
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_totalOrderSeek(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->total_order_seek;
+jboolean Java_org_rocksdb_ReadOptions_totalOrderSeek(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+      ->total_order_seek;
 }
 
 /*
@@ -6332,9 +6792,8 @@ jboolean Java_org_rocksdb_ReadOptions_totalOrderSeek(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ReadOptions_setTotalOrderSeek(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jtotal_order_seek) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->total_order_seek =
+    JNIEnv*, jobject, jlong jhandle, jboolean jtotal_order_seek) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->total_order_seek =
       static_cast<bool>(jtotal_order_seek);
 }
 
@@ -6343,10 +6802,10 @@ void Java_org_rocksdb_ReadOptions_setTotalOrderSeek(
  * Method:    prefixSameAsStart
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_prefixSameAsStart(JNIEnv* /*env*/,
-                                                        jobject /*jobj*/,
-                                                        jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->prefix_same_as_start;
+jboolean Java_org_rocksdb_ReadOptions_prefixSameAsStart(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+      ->prefix_same_as_start;
 }
 
 /*
@@ -6355,10 +6814,9 @@ jboolean Java_org_rocksdb_ReadOptions_prefixSameAsStart(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ReadOptions_setPrefixSameAsStart(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jprefix_same_as_start) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->prefix_same_as_start =
-      static_cast<bool>(jprefix_same_as_start);
+    JNIEnv*, jobject, jlong jhandle, jboolean jprefix_same_as_start) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+      ->prefix_same_as_start = static_cast<bool>(jprefix_same_as_start);
 }
 
 /*
@@ -6366,9 +6824,9 @@ void Java_org_rocksdb_ReadOptions_setPrefixSameAsStart(
  * Method:    pinData
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_pinData(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle) {
-  return reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->pin_data;
+jboolean Java_org_rocksdb_ReadOptions_pinData(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->pin_data;
 }
 
 /*
@@ -6376,10 +6834,9 @@ jboolean Java_org_rocksdb_ReadOptions_pinData(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setPinData
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setPinData(JNIEnv* /*env*/, jobject /*jobj*/,
-                                             jlong jhandle,
-                                             jboolean jpin_data) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->pin_data =
+void Java_org_rocksdb_ReadOptions_setPinData(
+    JNIEnv*, jobject, jlong jhandle, jboolean jpin_data) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->pin_data =
       static_cast<bool>(jpin_data);
 }
 
@@ -6389,8 +6846,8 @@ void Java_org_rocksdb_ReadOptions_setPinData(JNIEnv* /*env*/, jobject /*jobj*/,
  * Signature: (J)Z
  */
 jboolean Java_org_rocksdb_ReadOptions_backgroundPurgeOnIteratorCleanup(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   return static_cast<jboolean>(opt->background_purge_on_iterator_cleanup);
 }
 
@@ -6400,9 +6857,9 @@ jboolean Java_org_rocksdb_ReadOptions_backgroundPurgeOnIteratorCleanup(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ReadOptions_setBackgroundPurgeOnIteratorCleanup(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
+    JNIEnv*, jobject, jlong jhandle,
     jboolean jbackground_purge_on_iterator_cleanup) {
-  auto* opt = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   opt->background_purge_on_iterator_cleanup =
       static_cast<bool>(jbackground_purge_on_iterator_cleanup);
 }
@@ -6412,10 +6869,9 @@ void Java_org_rocksdb_ReadOptions_setBackgroundPurgeOnIteratorCleanup(
  * Method:    readaheadSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_readaheadSize(JNIEnv* /*env*/,
-                                                 jobject /*jobj*/,
-                                                 jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+jlong Java_org_rocksdb_ReadOptions_readaheadSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   return static_cast<jlong>(opt->readahead_size);
 }
 
@@ -6424,23 +6880,43 @@ jlong Java_org_rocksdb_ReadOptions_readaheadSize(JNIEnv* /*env*/,
  * Method:    setReadaheadSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_ReadOptions_setReadaheadSize(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jlong jreadahead_size) {
-  auto* opt = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+void Java_org_rocksdb_ReadOptions_setReadaheadSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jreadahead_size) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   opt->readahead_size = static_cast<size_t>(jreadahead_size);
 }
 
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    maxSkippableInternalKeys
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_maxSkippableInternalKeys(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  return static_cast<jlong>(opt->max_skippable_internal_keys);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setMaxSkippableInternalKeys
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setMaxSkippableInternalKeys(
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_skippable_internal_keys) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  opt->max_skippable_internal_keys =
+      static_cast<uint64_t>(jmax_skippable_internal_keys);
+}
+
 /*
  * Class:     org_rocksdb_ReadOptions
  * Method:    ignoreRangeDeletions
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_ignoreRangeDeletions(JNIEnv* /*env*/,
-                                                           jobject /*jobj*/,
-                                                           jlong jhandle) {
-  auto* opt = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+jboolean Java_org_rocksdb_ReadOptions_ignoreRangeDeletions(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   return static_cast<jboolean>(opt->ignore_range_deletions);
 }
 
@@ -6450,9 +6926,8 @@ jboolean Java_org_rocksdb_ReadOptions_ignoreRangeDeletions(JNIEnv* /*env*/,
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_ReadOptions_setIgnoreRangeDeletions(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean jignore_range_deletions) {
-  auto* opt = reinterpret_cast<rocksdb::ReadOptions*>(jhandle);
+    JNIEnv*, jobject, jlong jhandle, jboolean jignore_range_deletions) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   opt->ignore_range_deletions = static_cast<bool>(jignore_range_deletions);
 }
 
@@ -6461,10 +6936,10 @@ void Java_org_rocksdb_ReadOptions_setIgnoreRangeDeletions(
  * Method:    setSnapshot
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_ReadOptions_setSnapshot(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle, jlong jsnapshot) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->snapshot =
-      reinterpret_cast<rocksdb::Snapshot*>(jsnapshot);
+void Java_org_rocksdb_ReadOptions_setSnapshot(
+    JNIEnv*, jobject, jlong jhandle, jlong jsnapshot) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->snapshot =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Snapshot*>(jsnapshot);
 }
 
 /*
@@ -6472,9 +6947,10 @@ void Java_org_rocksdb_ReadOptions_setSnapshot(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    snapshot
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_snapshot(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
-  auto& snapshot = reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->snapshot;
+jlong Java_org_rocksdb_ReadOptions_snapshot(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto& snapshot =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->snapshot;
   return reinterpret_cast<jlong>(snapshot);
 }
 
@@ -6483,10 +6959,10 @@ jlong Java_org_rocksdb_ReadOptions_snapshot(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    readTier
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ReadOptions_readTier(JNIEnv* /*env*/, jobject /*jobj*/,
-                                            jlong jhandle) {
+jbyte Java_org_rocksdb_ReadOptions_readTier(
+    JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jbyte>(
-      reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->read_tier);
+      reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->read_tier);
 }
 
 /*
@@ -6494,10 +6970,10 @@ jbyte Java_org_rocksdb_ReadOptions_readTier(JNIEnv* /*env*/, jobject /*jobj*/,
  * Method:    setReadTier
  * Signature: (JB)V
  */
-void Java_org_rocksdb_ReadOptions_setReadTier(JNIEnv* /*env*/, jobject /*jobj*/,
-                                              jlong jhandle, jbyte jread_tier) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->read_tier =
-      static_cast<rocksdb::ReadTier>(jread_tier);
+void Java_org_rocksdb_ReadOptions_setReadTier(
+    JNIEnv*, jobject, jlong jhandle, jbyte jread_tier) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->read_tier =
+      static_cast<ROCKSDB_NAMESPACE::ReadTier>(jread_tier);
 }
 
 /*
@@ -6506,10 +6982,10 @@ void Java_org_rocksdb_ReadOptions_setReadTier(JNIEnv* /*env*/, jobject /*jobj*/,
  * Signature: (JJ)I
  */
 void Java_org_rocksdb_ReadOptions_setIterateUpperBound(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jlong jupper_bound_slice_handle) {
-  reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->iterate_upper_bound =
-      reinterpret_cast<rocksdb::Slice*>(jupper_bound_slice_handle);
+    JNIEnv*, jobject, jlong jhandle, jlong jupper_bound_slice_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+      ->iterate_upper_bound =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Slice*>(jupper_bound_slice_handle);
 }
 
 /*
@@ -6517,50 +6993,165 @@ void Java_org_rocksdb_ReadOptions_setIterateUpperBound(
  * Method:    iterateUpperBound
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_iterateUpperBound(JNIEnv* /*env*/,
-                                                     jobject /*jobj*/,
-                                                     jlong jhandle) {
+jlong Java_org_rocksdb_ReadOptions_iterateUpperBound(
+    JNIEnv*, jobject, jlong jhandle) {
   auto& upper_bound_slice_handle =
-      reinterpret_cast<rocksdb::ReadOptions*>(jhandle)->iterate_upper_bound;
+      reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+          ->iterate_upper_bound;
   return reinterpret_cast<jlong>(upper_bound_slice_handle);
 }
 
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setIterateLowerBound
+ * Signature: (JJ)I
+ */
+void Java_org_rocksdb_ReadOptions_setIterateLowerBound(
+    JNIEnv*, jobject, jlong jhandle, jlong jlower_bound_slice_handle) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+      ->iterate_lower_bound =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Slice*>(jlower_bound_slice_handle);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    iterateLowerBound
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_iterateLowerBound(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto& lower_bound_slice_handle =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
+          ->iterate_lower_bound;
+  return reinterpret_cast<jlong>(lower_bound_slice_handle);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setTableFilter
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setTableFilter(
+    JNIEnv*, jobject, jlong jhandle, jlong jjni_table_filter_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  auto* jni_table_filter =
+      reinterpret_cast<ROCKSDB_NAMESPACE::TableFilterJniCallback*>(
+          jjni_table_filter_handle);
+  opt->table_filter = jni_table_filter->GetTableFilterFunction();
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setIterStartSeqnum
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setIterStartSeqnum(
+    JNIEnv*, jobject, jlong jhandle, jlong jiter_start_seqnum) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  opt->iter_start_seqnum = static_cast<uint64_t>(jiter_start_seqnum);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    iterStartSeqnum
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_iterStartSeqnum(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  return static_cast<jlong>(opt->iter_start_seqnum);
+}
+
 /////////////////////////////////////////////////////////////////////
-// rocksdb::ComparatorOptions
+// ROCKSDB_NAMESPACE::ComparatorOptions
 
 /*
  * Class:     org_rocksdb_ComparatorOptions
  * Method:    newComparatorOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_ComparatorOptions_newComparatorOptions(JNIEnv* /*env*/,
-                                                              jclass /*jcls*/) {
-  auto* comparator_opt = new rocksdb::ComparatorJniCallbackOptions();
+jlong Java_org_rocksdb_ComparatorOptions_newComparatorOptions(
+    JNIEnv*, jclass) {
+  auto* comparator_opt = new ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions();
   return reinterpret_cast<jlong>(comparator_opt);
 }
 
 /*
  * Class:     org_rocksdb_ComparatorOptions
- * Method:    useAdaptiveMutex
+ * Method:    reusedSynchronisationType
+ * Signature: (J)B
+ */
+jbyte Java_org_rocksdb_ComparatorOptions_reusedSynchronisationType(
+    JNIEnv *, jobject, jlong jhandle) {
+  auto* comparator_opt =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
+          jhandle);
+  return ROCKSDB_NAMESPACE::ReusedSynchronisationTypeJni::
+      toJavaReusedSynchronisationType(
+          comparator_opt->reused_synchronisation_type);
+}
+
+/*
+ * Class:     org_rocksdb_ComparatorOptions
+ * Method:    setReusedSynchronisationType
+ * Signature: (JB)V
+ */
+void Java_org_rocksdb_ComparatorOptions_setReusedSynchronisationType(
+    JNIEnv*, jobject, jlong jhandle, jbyte jreused_synhcronisation_type) {
+  auto* comparator_opt =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
+          jhandle);
+  comparator_opt->reused_synchronisation_type =
+      ROCKSDB_NAMESPACE::ReusedSynchronisationTypeJni::
+          toCppReusedSynchronisationType(jreused_synhcronisation_type);
+}
+
+/*
+ * Class:     org_rocksdb_ComparatorOptions
+ * Method:    useDirectBuffer
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ComparatorOptions_useAdaptiveMutex(JNIEnv* /*env*/,
-                                                             jobject /*jobj*/,
-                                                             jlong jhandle) {
-  return reinterpret_cast<rocksdb::ComparatorJniCallbackOptions*>(jhandle)
-      ->use_adaptive_mutex;
+jboolean Java_org_rocksdb_ComparatorOptions_useDirectBuffer(
+    JNIEnv*, jobject, jlong jhandle) {
+  return static_cast<jboolean>(
+      reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
+          jhandle)
+          ->direct_buffer);
 }
 
 /*
  * Class:     org_rocksdb_ComparatorOptions
- * Method:    setUseAdaptiveMutex
+ * Method:    setUseDirectBuffer
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ComparatorOptions_setUseAdaptiveMutex(
-    JNIEnv* /*env*/, jobject /*jobj*/, jlong jhandle,
-    jboolean juse_adaptive_mutex) {
-  reinterpret_cast<rocksdb::ComparatorJniCallbackOptions*>(jhandle)
-      ->use_adaptive_mutex = static_cast<bool>(juse_adaptive_mutex);
+void Java_org_rocksdb_ComparatorOptions_setUseDirectBuffer(
+    JNIEnv*, jobject, jlong jhandle, jboolean jdirect_buffer) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(jhandle)
+      ->direct_buffer = jdirect_buffer == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_ComparatorOptions
+ * Method:    maxReusedBufferSize
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_ComparatorOptions_maxReusedBufferSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  return static_cast<jint>(
+      reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
+          jhandle)
+          ->max_reused_buffer_size);
+}
+
+/*
+ * Class:     org_rocksdb_ComparatorOptions
+ * Method:    setMaxReusedBufferSize
+ * Signature: (JI)V
+ */
+void Java_org_rocksdb_ComparatorOptions_setMaxReusedBufferSize(
+    JNIEnv*, jobject, jlong jhandle, jint jmax_reused_buffer_size) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(jhandle)
+      ->max_reused_buffer_size = static_cast<int32_t>(jmax_reused_buffer_size);
 }
 
 /*
@@ -6568,26 +7159,26 @@ void Java_org_rocksdb_ComparatorOptions_setUseAdaptiveMutex(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_ComparatorOptions_disposeInternal(JNIEnv* /*env*/,
-                                                        jobject /*jobj*/,
-                                                        jlong jhandle) {
+void Java_org_rocksdb_ComparatorOptions_disposeInternal(
+    JNIEnv*, jobject, jlong jhandle) {
   auto* comparator_opt =
-      reinterpret_cast<rocksdb::ComparatorJniCallbackOptions*>(jhandle);
+      reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
+          jhandle);
   assert(comparator_opt != nullptr);
   delete comparator_opt;
 }
 
 /////////////////////////////////////////////////////////////////////
-// rocksdb::FlushOptions
+// ROCKSDB_NAMESPACE::FlushOptions
 
 /*
  * Class:     org_rocksdb_FlushOptions
  * Method:    newFlushOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_FlushOptions_newFlushOptions(JNIEnv* /*env*/,
-                                                    jclass /*jcls*/) {
-  auto* flush_opt = new rocksdb::FlushOptions();
+jlong Java_org_rocksdb_FlushOptions_newFlushOptions(
+    JNIEnv*, jclass) {
+  auto* flush_opt = new ROCKSDB_NAMESPACE::FlushOptions();
   return reinterpret_cast<jlong>(flush_opt);
 }
 
@@ -6596,11 +7187,9 @@ jlong Java_org_rocksdb_FlushOptions_newFlushOptions(JNIEnv* /*env*/,
  * Method:    setWaitForFlush
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_FlushOptions_setWaitForFlush(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle,
-                                                   jboolean jwait) {
-  reinterpret_cast<rocksdb::FlushOptions*>(jhandle)->wait =
+void Java_org_rocksdb_FlushOptions_setWaitForFlush(
+    JNIEnv*, jobject, jlong jhandle, jboolean jwait) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle)->wait =
       static_cast<bool>(jwait);
 }
 
@@ -6609,10 +7198,33 @@ void Java_org_rocksdb_FlushOptions_setWaitForFlush(JNIEnv* /*env*/,
  * Method:    waitForFlush
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_FlushOptions_waitForFlush(JNIEnv* /*env*/,
-                                                    jobject /*jobj*/,
-                                                    jlong jhandle) {
-  return reinterpret_cast<rocksdb::FlushOptions*>(jhandle)->wait;
+jboolean Java_org_rocksdb_FlushOptions_waitForFlush(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle)->wait;
+}
+
+/*
+ * Class:     org_rocksdb_FlushOptions
+ * Method:    setAllowWriteStall
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_FlushOptions_setAllowWriteStall(
+    JNIEnv*, jobject, jlong jhandle, jboolean jallow_write_stall) {
+  auto* flush_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle);
+  flush_options->allow_write_stall = jallow_write_stall == JNI_TRUE;
+}
+
+/*
+ * Class:     org_rocksdb_FlushOptions
+ * Method:    allowWriteStall
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_FlushOptions_allowWriteStall(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* flush_options =
+      reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle);
+  return static_cast<jboolean>(flush_options->allow_write_stall);
 }
 
 /*
@@ -6620,10 +7232,9 @@ jboolean Java_org_rocksdb_FlushOptions_waitForFlush(JNIEnv* /*env*/,
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_FlushOptions_disposeInternal(JNIEnv* /*env*/,
-                                                   jobject /*jobj*/,
-                                                   jlong jhandle) {
-  auto* flush_opt = reinterpret_cast<rocksdb::FlushOptions*>(jhandle);
+void Java_org_rocksdb_FlushOptions_disposeInternal(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* flush_opt = reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle);
   assert(flush_opt != nullptr);
   delete flush_opt;
 }