]> git.proxmox.com Git - ceph.git/blobdiff - ceph/src/rocksdb/java/rocksjni/options.cc
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / rocksdb / java / rocksjni / options.cc
index b11edf7fcfe9bdcdf5d8a7d5bde2d89f0a843175..b848ea9cffd43c3d2a714893da7c4c2f2a2f35f7 100644 (file)
@@ -33,6 +33,7 @@
 #include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
 #include "rocksjni/comparatorjnicallback.h"
+#include "rocksjni/cplusplus_to_java_convert.h"
 #include "rocksjni/portal.h"
 #include "rocksjni/statisticsjni.h"
 #include "rocksjni/table_filter_jnicallback.h"
  * Method:    newOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_Options_newOptions__(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_Options_newOptions__(JNIEnv*, jclass) {
   auto* op = new ROCKSDB_NAMESPACE::Options();
-  return reinterpret_cast<jlong>(op);
+  return GET_CPLUSPLUS_POINTER(op);
 }
 
 /*
@@ -54,14 +54,14 @@ jlong Java_org_rocksdb_Options_newOptions__(
  * Method:    newOptions
  * Signature: (JJ)J
  */
-jlong Java_org_rocksdb_Options_newOptions__JJ(
-    JNIEnv*, jclass, jlong jdboptions, jlong jcfoptions) {
+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);
+  return GET_CPLUSPLUS_POINTER(op);
 }
 
 /*
@@ -69,11 +69,10 @@ jlong Java_org_rocksdb_Options_newOptions__JJ(
  * Method:    copyOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_copyOptions(
-    JNIEnv*, jclass, jlong 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);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -81,8 +80,7 @@ jlong Java_org_rocksdb_Options_copyOptions(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_Options_disposeInternal(
-    JNIEnv*, jobject, jlong handle) {
+void Java_org_rocksdb_Options_disposeInternal(JNIEnv*, jobject, jlong handle) {
   auto* op = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(handle);
   assert(op != nullptr);
   delete op;
@@ -93,8 +91,9 @@ void Java_org_rocksdb_Options_disposeInternal(
  * Method:    setIncreaseParallelism
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setIncreaseParallelism(
-    JNIEnv*, jobject, jlong jhandle, jint totalThreads) {
+void Java_org_rocksdb_Options_setIncreaseParallelism(JNIEnv*, jobject,
+                                                     jlong jhandle,
+                                                     jint totalThreads) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->IncreaseParallelism(
       static_cast<int>(totalThreads));
 }
@@ -104,8 +103,8 @@ void Java_org_rocksdb_Options_setIncreaseParallelism(
  * Method:    setCreateIfMissing
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setCreateIfMissing(
-    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+void Java_org_rocksdb_Options_setCreateIfMissing(JNIEnv*, jobject,
+                                                 jlong jhandle, jboolean flag) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->create_if_missing =
       flag;
 }
@@ -115,8 +114,8 @@ void Java_org_rocksdb_Options_setCreateIfMissing(
  * Method:    createIfMissing
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_createIfMissing(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_createIfMissing(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->create_if_missing;
 }
@@ -126,8 +125,9 @@ jboolean Java_org_rocksdb_Options_createIfMissing(
  * Method:    setCreateMissingColumnFamilies
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setCreateMissingColumnFamilies(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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,8 +137,8 @@ void Java_org_rocksdb_Options_setCreateMissingColumnFamilies(
  * Method:    createMissingColumnFamilies
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_createMissingColumnFamilies(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_createMissingColumnFamilies(JNIEnv*, jobject,
+                                                              jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->create_missing_column_families;
 }
@@ -148,8 +148,9 @@ jboolean Java_org_rocksdb_Options_createMissingColumnFamilies(
  * Method:    setComparatorHandle
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setComparatorHandle__JI(
-    JNIEnv*, jobject, jlong jhandle, jint builtinComparator) {
+void Java_org_rocksdb_Options_setComparatorHandle__JI(JNIEnv*, jobject,
+                                                      jlong jhandle,
+                                                      jint builtinComparator) {
   switch (builtinComparator) {
     case 1:
       reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->comparator =
@@ -167,9 +168,10 @@ void Java_org_rocksdb_Options_setComparatorHandle__JI(
  * Method:    setComparatorHandle
  * Signature: (JJB)V
  */
-void Java_org_rocksdb_Options_setComparatorHandle__JJB(
-    JNIEnv*, jobject, jlong jopt_handle, jlong jcomparator_handle,
-    jbyte jcomparator_type) {
+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
@@ -193,8 +195,9 @@ void Java_org_rocksdb_Options_setComparatorHandle__JJB(
  * Method:    setMergeOperatorName
  * Signature: (JJjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setMergeOperatorName(
-    JNIEnv* env, jobject, 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
@@ -213,8 +216,8 @@ void Java_org_rocksdb_Options_setMergeOperatorName(
  * Method:    setMergeOperator
  * Signature: (JJjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setMergeOperator(
-    JNIEnv*, jobject, jlong jhandle, jlong mergeOperatorHandle) {
+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));
@@ -226,8 +229,7 @@ void Java_org_rocksdb_Options_setMergeOperator(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setCompactionFilterHandle(
-    JNIEnv*, jobject, jlong jopt_handle,
-    jlong jcompactionfilter_handle) {
+    JNIEnv*, jobject, jlong jopt_handle, jlong jcompactionfilter_handle) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jopt_handle)
       ->compaction_filter =
       reinterpret_cast<ROCKSDB_NAMESPACE::CompactionFilter*>(
@@ -254,8 +256,9 @@ void JNICALL Java_org_rocksdb_Options_setCompactionFilterFactoryHandle(
  * Method:    setWriteBufferSize
  * Signature: (JJ)I
  */
-void Java_org_rocksdb_Options_setWriteBufferSize(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -286,8 +289,8 @@ void Java_org_rocksdb_Options_setWriteBufferManager(
  * Method:    writeBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writeBufferSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_writeBufferSize(JNIEnv*, jobject,
+                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->write_buffer_size;
 }
@@ -298,8 +301,7 @@ jlong Java_org_rocksdb_Options_writeBufferSize(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setMaxWriteBufferNumber(
-    JNIEnv*, jobject, jlong jhandle,
-    jint jmax_write_buffer_number) {
+    JNIEnv*, jobject, jlong jhandle, jint jmax_write_buffer_number) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_write_buffer_number = jmax_write_buffer_number;
 }
@@ -309,8 +311,8 @@ void Java_org_rocksdb_Options_setMaxWriteBufferNumber(
  * Method:    setStatistics
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setStatistics(
-    JNIEnv*, jobject, jlong jhandle, jlong 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>*>(
@@ -323,8 +325,7 @@ void Java_org_rocksdb_Options_setStatistics(
  * Method:    statistics
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_statistics(
-    JNIEnv*, jobject, jlong jhandle) {
+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) {
@@ -332,7 +333,7 @@ jlong Java_org_rocksdb_Options_statistics(
   } else {
     std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>* pSptr =
         new std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>(sptr);
-    return reinterpret_cast<jlong>(pSptr);
+    return GET_CPLUSPLUS_POINTER(pSptr);
   }
 }
 
@@ -341,8 +342,8 @@ jlong Java_org_rocksdb_Options_statistics(
  * Method:    maxWriteBufferNumber
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxWriteBufferNumber(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxWriteBufferNumber(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_write_buffer_number;
 }
@@ -352,8 +353,8 @@ jint Java_org_rocksdb_Options_maxWriteBufferNumber(
  * Method:    errorIfExists
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_errorIfExists(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_errorIfExists(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->error_if_exists;
 }
@@ -363,8 +364,8 @@ jboolean Java_org_rocksdb_Options_errorIfExists(
  * Method:    setErrorIfExists
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setErrorIfExists(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -374,8 +375,8 @@ void Java_org_rocksdb_Options_setErrorIfExists(
  * Method:    paranoidChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_paranoidChecks(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_paranoidChecks(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->paranoid_checks;
 }
@@ -385,8 +386,8 @@ jboolean Java_org_rocksdb_Options_paranoidChecks(
  * Method:    setParanoidChecks
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setParanoidChecks(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -396,8 +397,8 @@ void Java_org_rocksdb_Options_setParanoidChecks(
  * Method:    setEnv
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setEnv(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -407,8 +408,9 @@ void Java_org_rocksdb_Options_setEnv(
  * Method:    setMaxTotalWalSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setMaxTotalWalSize(
-    JNIEnv*, jobject, jlong jhandle, jlong jmax_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);
 }
@@ -418,8 +420,8 @@ void Java_org_rocksdb_Options_setMaxTotalWalSize(
  * Method:    maxTotalWalSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxTotalWalSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxTotalWalSize(JNIEnv*, jobject,
+                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_total_wal_size;
 }
@@ -429,8 +431,7 @@ jlong Java_org_rocksdb_Options_maxTotalWalSize(
  * Method:    maxOpenFiles
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxOpenFiles(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxOpenFiles(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->max_open_files;
 }
 
@@ -439,8 +440,8 @@ jint Java_org_rocksdb_Options_maxOpenFiles(
  * Method:    setMaxOpenFiles
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxOpenFiles(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -461,8 +462,8 @@ void Java_org_rocksdb_Options_setMaxFileOpeningThreads(
  * Method:    maxFileOpeningThreads
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxFileOpeningThreads(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -472,8 +473,7 @@ jint Java_org_rocksdb_Options_maxFileOpeningThreads(
  * Method:    useFsync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_useFsync(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_useFsync(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->use_fsync;
 }
 
@@ -482,8 +482,8 @@ jboolean Java_org_rocksdb_Options_useFsync(
  * Method:    setUseFsync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUseFsync(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -493,9 +493,9 @@ void Java_org_rocksdb_Options_setUseFsync(
  * Method:    setDbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_Options_setDbPaths(
-    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
-    jlongArray jtarget_sizes) {
+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) {
@@ -539,8 +539,7 @@ void Java_org_rocksdb_Options_setDbPaths(
  * Method:    dbPathsLen
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_dbPathsLen(
-    JNIEnv*, jobject, jlong 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());
 }
@@ -550,9 +549,9 @@ jlong Java_org_rocksdb_Options_dbPathsLen(
  * Method:    dbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_Options_dbPaths(
-    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
-    jlongArray jtarget_sizes) {
+void Java_org_rocksdb_Options_dbPaths(JNIEnv* env, jobject, jlong jhandle,
+                                      jobjectArray jpaths,
+                                      jlongArray jtarget_sizes) {
   jboolean is_copy;
   jlong* ptr_jtarget_size = env->GetLongArrayElements(jtarget_sizes, &is_copy);
   if (ptr_jtarget_size == nullptr) {
@@ -591,8 +590,7 @@ void Java_org_rocksdb_Options_dbPaths(
  * Method:    dbLogDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_dbLogDir(
-    JNIEnv* env, jobject, jlong jhandle) {
+jstring Java_org_rocksdb_Options_dbLogDir(JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
       reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
           ->db_log_dir.c_str());
@@ -603,8 +601,8 @@ jstring Java_org_rocksdb_Options_dbLogDir(
  * Method:    setDbLogDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setDbLogDir(
-    JNIEnv* env, jobject, 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
@@ -620,8 +618,7 @@ void Java_org_rocksdb_Options_setDbLogDir(
  * Method:    walDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_walDir(
-    JNIEnv* env, jobject, jlong jhandle) {
+jstring Java_org_rocksdb_Options_walDir(JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
       reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->wal_dir.c_str());
 }
@@ -631,8 +628,8 @@ jstring Java_org_rocksdb_Options_walDir(
  * Method:    setWalDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_Options_setWalDir(
-    JNIEnv* env, jobject, 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
@@ -648,8 +645,8 @@ void Java_org_rocksdb_Options_setWalDir(
  * Method:    deleteObsoleteFilesPeriodMicros
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_deleteObsoleteFilesPeriodMicros(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_deleteObsoleteFilesPeriodMicros(JNIEnv*, jobject,
+                                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->delete_obsolete_files_period_micros;
 }
@@ -659,41 +656,21 @@ jlong Java_org_rocksdb_Options_deleteObsoleteFilesPeriodMicros(
  * Method:    setDeleteObsoleteFilesPeriodMicros
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setDeleteObsoleteFilesPeriodMicros(
-    JNIEnv*, jobject, jlong jhandle, jlong micros) {
+void Java_org_rocksdb_Options_setDeleteObsoleteFilesPeriodMicros(JNIEnv*,
+                                                                 jobject,
+                                                                 jlong jhandle,
+                                                                 jlong micros) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->delete_obsolete_files_period_micros = static_cast<int64_t>(micros);
 }
 
-/*
- * Class:     org_rocksdb_Options
- * Method:    setBaseBackgroundCompactions
- * Signature: (JI)V
- */
-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);
-}
-
-/*
- * Class:     org_rocksdb_Options
- * Method:    baseBackgroundCompactions
- * Signature: (J)I
- */
-jint Java_org_rocksdb_Options_baseBackgroundCompactions(
-    JNIEnv*, jobject, jlong jhandle) {
-  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
-      ->base_background_compactions;
-}
-
 /*
  * Class:     org_rocksdb_Options
  * Method:    maxBackgroundCompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxBackgroundCompactions(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxBackgroundCompactions(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_background_compactions;
 }
@@ -703,8 +680,9 @@ jint Java_org_rocksdb_Options_maxBackgroundCompactions(
  * Method:    setMaxBackgroundCompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxBackgroundCompactions(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -714,8 +692,8 @@ void Java_org_rocksdb_Options_setMaxBackgroundCompactions(
  * Method:    setMaxSubcompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxSubcompactions(
-    JNIEnv*, jobject, jlong jhandle, jint max) {
+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);
 }
@@ -725,8 +703,8 @@ void Java_org_rocksdb_Options_setMaxSubcompactions(
  * Method:    maxSubcompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxSubcompactions(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxSubcompactions(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_subcompactions;
 }
@@ -736,8 +714,8 @@ jint Java_org_rocksdb_Options_maxSubcompactions(
  * Method:    maxBackgroundFlushes
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxBackgroundFlushes(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxBackgroundFlushes(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_background_flushes;
 }
@@ -758,8 +736,8 @@ void Java_org_rocksdb_Options_setMaxBackgroundFlushes(
  * Method:    maxBackgroundJobs
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxBackgroundJobs(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxBackgroundJobs(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_background_jobs;
 }
@@ -769,8 +747,9 @@ jint Java_org_rocksdb_Options_maxBackgroundJobs(
  * Method:    setMaxBackgroundJobs
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setMaxBackgroundJobs(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -780,8 +759,7 @@ void Java_org_rocksdb_Options_setMaxBackgroundJobs(
  * Method:    maxLogFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxLogFileSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxLogFileSize(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_log_file_size;
 }
@@ -791,8 +769,9 @@ jlong Java_org_rocksdb_Options_maxLogFileSize(
  * Method:    setMaxLogFileSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setMaxLogFileSize(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -808,8 +787,8 @@ void Java_org_rocksdb_Options_setMaxLogFileSize(
  * Method:    logFileTimeToRoll
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_logFileTimeToRoll(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_logFileTimeToRoll(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->log_file_time_to_roll;
 }
@@ -836,8 +815,7 @@ void Java_org_rocksdb_Options_setLogFileTimeToRoll(
  * Method:    keepLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_keepLogFileNum(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_keepLogFileNum(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->keep_log_file_num;
 }
@@ -847,8 +825,9 @@ jlong Java_org_rocksdb_Options_keepLogFileNum(
  * Method:    setKeepLogFileNum
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setKeepLogFileNum(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -864,8 +843,8 @@ void Java_org_rocksdb_Options_setKeepLogFileNum(
  * Method:    recycleLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_recycleLogFileNum(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_recycleLogFileNum(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->recycle_log_file_num;
 }
@@ -875,8 +854,9 @@ jlong Java_org_rocksdb_Options_recycleLogFileNum(
  * Method:    setRecycleLogFileNum
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setRecycleLogFileNum(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -892,8 +872,8 @@ void Java_org_rocksdb_Options_setRecycleLogFileNum(
  * Method:    maxManifestFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxManifestFileSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxManifestFileSize(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_manifest_file_size;
 }
@@ -902,8 +882,8 @@ jlong Java_org_rocksdb_Options_maxManifestFileSize(
  * Method:    memTableFactoryName
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_memTableFactoryName(
-    JNIEnv* env, jobject, jlong jhandle) {
+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();
 
@@ -945,6 +925,7 @@ rocksdb_convert_cf_paths_from_java_helper(JNIEnv* env, jobjectArray path_array,
   jlong* size_array_ptr = env->GetLongArrayElements(size_array, nullptr);
   if (nullptr == size_array_ptr) {
     // exception thrown: OutOfMemoryError
+    *has_exception = JNI_TRUE;
     return {};
   }
   std::vector<ROCKSDB_NAMESPACE::DbPath> cf_paths;
@@ -977,7 +958,7 @@ void Java_org_rocksdb_Options_setCfPaths(JNIEnv* env, jclass, jlong jhandle,
                                          jobjectArray path_array,
                                          jlongArray size_array) {
   auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
-  jboolean has_exception;
+  jboolean has_exception = JNI_FALSE;
   std::vector<ROCKSDB_NAMESPACE::DbPath> cf_paths =
       rocksdb_convert_cf_paths_from_java_helper(env, path_array, size_array,
                                                 &has_exception);
@@ -1062,8 +1043,9 @@ void Java_org_rocksdb_Options_setMaxManifestFileSize(
  * Method:    setMemTableFactory
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setMemTableFactory(
-    JNIEnv*, jobject, jlong jhandle, jlong 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*>(
@@ -1075,8 +1057,8 @@ void Java_org_rocksdb_Options_setMemTableFactory(
  * Method:    setRateLimiter
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setRateLimiter(
-    JNIEnv*, jobject, jlong jhandle, jlong jrate_limiter_handle) {
+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);
@@ -1103,8 +1085,8 @@ void Java_org_rocksdb_Options_setSstFileManager(
  * Method:    setLogger
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setLogger(
-    JNIEnv*, jobject, jlong jhandle, jlong jlogger_handle) {
+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);
@@ -1116,8 +1098,8 @@ void Java_org_rocksdb_Options_setLogger(
  * Method:    setInfoLogLevel
  * Signature: (JB)V
  */
-void Java_org_rocksdb_Options_setInfoLogLevel(
-    JNIEnv*, jobject, jlong jhandle, jbyte 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);
 }
@@ -1127,8 +1109,7 @@ void Java_org_rocksdb_Options_setInfoLogLevel(
  * Method:    infoLogLevel
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_infoLogLevel(
-    JNIEnv*, jobject, jlong jhandle) {
+jbyte Java_org_rocksdb_Options_infoLogLevel(JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jbyte>(
       reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->info_log_level);
 }
@@ -1138,8 +1119,8 @@ jbyte Java_org_rocksdb_Options_infoLogLevel(
  * Method:    tableCacheNumshardbits
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_tableCacheNumshardbits(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_tableCacheNumshardbits(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->table_cache_numshardbits;
 }
@@ -1170,8 +1151,9 @@ void Java_org_rocksdb_Options_useFixedLengthPrefixExtractor(
  * Method:    useCappedPrefixExtractor
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_useCappedPrefixExtractor(
-    JNIEnv*, jobject, jlong jhandle, jint 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)));
@@ -1182,8 +1164,7 @@ void Java_org_rocksdb_Options_useCappedPrefixExtractor(
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_walTtlSeconds(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_walTtlSeconds(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->WAL_ttl_seconds;
 }
@@ -1193,8 +1174,8 @@ jlong Java_org_rocksdb_Options_walTtlSeconds(
  * Method:    setWalTtlSeconds
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWalTtlSeconds(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -1204,8 +1185,7 @@ void Java_org_rocksdb_Options_setWalTtlSeconds(
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_walSizeLimitMB(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_walSizeLimitMB(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->WAL_size_limit_MB;
 }
@@ -1215,8 +1195,8 @@ jlong Java_org_rocksdb_Options_walSizeLimitMB(
  * Method:    setWalSizeLimitMB
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWalSizeLimitMB(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -1249,8 +1229,8 @@ jlong Java_org_rocksdb_Options_maxWriteBatchGroupSizeBytes(JNIEnv*, jclass,
  * Method:    manifestPreallocationSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_manifestPreallocationSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_manifestPreallocationSize(JNIEnv*, jobject,
+                                                         jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->manifest_preallocation_size;
 }
@@ -1276,8 +1256,8 @@ void Java_org_rocksdb_Options_setManifestPreallocationSize(
  * Method:    setTableFactory
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setTableFactory(
-    JNIEnv*, jobject, jlong jhandle, jlong jtable_factory_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);
@@ -1317,8 +1297,8 @@ void Java_org_rocksdb_Options_setCompactionThreadLimiter(
  * Method:    allowMmapReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowMmapReads(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_allowMmapReads(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->allow_mmap_reads;
 }
@@ -1328,8 +1308,8 @@ jboolean Java_org_rocksdb_Options_allowMmapReads(
  * Method:    setAllowMmapReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowMmapReads(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -1339,8 +1319,8 @@ void Java_org_rocksdb_Options_setAllowMmapReads(
  * Method:    allowMmapWrites
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowMmapWrites(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_allowMmapWrites(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->allow_mmap_writes;
 }
@@ -1350,8 +1330,9 @@ jboolean Java_org_rocksdb_Options_allowMmapWrites(
  * Method:    setAllowMmapWrites
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowMmapWrites(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -1361,8 +1342,8 @@ void Java_org_rocksdb_Options_setAllowMmapWrites(
  * Method:    useDirectReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_useDirectReads(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_useDirectReads(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->use_direct_reads;
 }
@@ -1372,8 +1353,8 @@ jboolean Java_org_rocksdb_Options_useDirectReads(
  * Method:    setUseDirectReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUseDirectReads(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -1407,8 +1388,8 @@ void Java_org_rocksdb_Options_setUseDirectIoForFlushAndCompaction(
  * Method:    setAllowFAllocate
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowFAllocate(
-    JNIEnv*, jobject, jlong jhandle, jboolean jallow_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);
 }
@@ -1418,8 +1399,8 @@ void Java_org_rocksdb_Options_setAllowFAllocate(
  * Method:    allowFAllocate
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowFAllocate(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1429,8 +1410,8 @@ jboolean Java_org_rocksdb_Options_allowFAllocate(
  * Method:    isFdCloseOnExec
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_isFdCloseOnExec(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_isFdCloseOnExec(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->is_fd_close_on_exec;
 }
@@ -1440,8 +1421,9 @@ jboolean Java_org_rocksdb_Options_isFdCloseOnExec(
  * Method:    setIsFdCloseOnExec
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setIsFdCloseOnExec(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -1451,8 +1433,8 @@ void Java_org_rocksdb_Options_setIsFdCloseOnExec(
  * Method:    statsDumpPeriodSec
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_statsDumpPeriodSec(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_statsDumpPeriodSec(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->stats_dump_period_sec;
 }
@@ -1463,8 +1445,7 @@ jint Java_org_rocksdb_Options_statsDumpPeriodSec(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setStatsDumpPeriodSec(
-    JNIEnv*, jobject, jlong jhandle,
-    jint jstats_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);
@@ -1475,8 +1456,8 @@ void Java_org_rocksdb_Options_setStatsDumpPeriodSec(
  * Method:    statsPersistPeriodSec
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_statsPersistPeriodSec(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_statsPersistPeriodSec(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->stats_persist_period_sec;
 }
@@ -1498,8 +1479,8 @@ void Java_org_rocksdb_Options_setStatsPersistPeriodSec(
  * Method:    statsHistoryBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_statsHistoryBufferSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_statsHistoryBufferSize(JNIEnv*, jobject,
+                                                      jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->stats_history_buffer_size;
 }
@@ -1521,8 +1502,8 @@ void Java_org_rocksdb_Options_setStatsHistoryBufferSize(
  * Method:    adviseRandomOnOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_adviseRandomOnOpen(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_adviseRandomOnOpen(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->advise_random_on_open;
 }
@@ -1533,8 +1514,7 @@ jboolean Java_org_rocksdb_Options_adviseRandomOnOpen(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setAdviseRandomOnOpen(
-    JNIEnv*, jobject, jlong jhandle,
-    jboolean advise_random_on_open) {
+    JNIEnv*, jobject, jlong jhandle, jboolean advise_random_on_open) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->advise_random_on_open = static_cast<bool>(advise_random_on_open);
 }
@@ -1545,8 +1525,7 @@ void Java_org_rocksdb_Options_setAdviseRandomOnOpen(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setDbWriteBufferSize(
-    JNIEnv*, jobject, jlong jhandle,
-    jlong jdb_write_buffer_size) {
+    JNIEnv*, jobject, jlong jhandle, jlong jdb_write_buffer_size) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->db_write_buffer_size = static_cast<size_t>(jdb_write_buffer_size);
 }
@@ -1556,8 +1535,8 @@ void Java_org_rocksdb_Options_setDbWriteBufferSize(
  * Method:    dbWriteBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_dbWriteBufferSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1568,8 +1547,7 @@ jlong Java_org_rocksdb_Options_dbWriteBufferSize(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setAccessHintOnCompactionStart(
-    JNIEnv*, jobject, jlong jhandle,
-    jbyte jaccess_hint_value) {
+    JNIEnv*, jobject, jlong jhandle, jbyte jaccess_hint_value) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->access_hint_on_compaction_start =
       ROCKSDB_NAMESPACE::AccessHintJni::toCppAccessHint(jaccess_hint_value);
@@ -1580,45 +1558,20 @@ void Java_org_rocksdb_Options_setAccessHintOnCompactionStart(
  * Method:    accessHintOnCompactionStart
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_accessHintOnCompactionStart(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
 
-/*
- * Class:     org_rocksdb_Options
- * Method:    setNewTableReaderForCompactionInputs
- * Signature: (JZ)V
- */
-void Java_org_rocksdb_Options_setNewTableReaderForCompactionInputs(
-    JNIEnv*, jobject, jlong jhandle,
-    jboolean jnew_table_reader_for_compaction_inputs) {
-  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
-  opt->new_table_reader_for_compaction_inputs =
-      static_cast<bool>(jnew_table_reader_for_compaction_inputs);
-}
-
-/*
- * Class:     org_rocksdb_Options
- * Method:    newTableReaderForCompactionInputs
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_Options_newTableReaderForCompactionInputs(
-    JNIEnv*, jobject, jlong jhandle) {
-  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
-  return static_cast<bool>(opt->new_table_reader_for_compaction_inputs);
-}
-
 /*
  * Class:     org_rocksdb_Options
  * Method:    setCompactionReadaheadSize
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setCompactionReadaheadSize(
-    JNIEnv*, jobject, jlong jhandle,
-    jlong jcompaction_readahead_size) {
+    JNIEnv*, jobject, jlong jhandle, jlong jcompaction_readahead_size) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->compaction_readahead_size =
       static_cast<size_t>(jcompaction_readahead_size);
@@ -1629,8 +1582,8 @@ void Java_org_rocksdb_Options_setCompactionReadaheadSize(
  * Method:    compactionReadaheadSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_compactionReadaheadSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1652,8 +1605,8 @@ void Java_org_rocksdb_Options_setRandomAccessMaxBufferSize(
  * Method:    randomAccessMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_randomAccessMaxBufferSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1664,8 +1617,7 @@ jlong Java_org_rocksdb_Options_randomAccessMaxBufferSize(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setWritableFileMaxBufferSize(
-    JNIEnv*, jobject, jlong jhandle,
-    jlong jwritable_file_max_buffer_size) {
+    JNIEnv*, jobject, jlong jhandle, jlong jwritable_file_max_buffer_size) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->writable_file_max_buffer_size =
       static_cast<size_t>(jwritable_file_max_buffer_size);
@@ -1676,8 +1628,8 @@ void Java_org_rocksdb_Options_setWritableFileMaxBufferSize(
  * Method:    writableFileMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writableFileMaxBufferSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1687,8 +1639,8 @@ jlong Java_org_rocksdb_Options_writableFileMaxBufferSize(
  * Method:    useAdaptiveMutex
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_useAdaptiveMutex(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_useAdaptiveMutex(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->use_adaptive_mutex;
 }
@@ -1698,8 +1650,9 @@ jboolean Java_org_rocksdb_Options_useAdaptiveMutex(
  * Method:    setUseAdaptiveMutex
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUseAdaptiveMutex(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -1709,8 +1662,7 @@ void Java_org_rocksdb_Options_setUseAdaptiveMutex(
  * Method:    bytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_bytesPerSync(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_bytesPerSync(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bytes_per_sync;
 }
 
@@ -1719,8 +1671,8 @@ jlong Java_org_rocksdb_Options_bytesPerSync(
  * Method:    setBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setBytesPerSync(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -1730,8 +1682,9 @@ void Java_org_rocksdb_Options_setBytesPerSync(
  * Method:    setWalBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWalBytesPerSync(
-    JNIEnv*, jobject, jlong jhandle, jlong jwal_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);
 }
@@ -1741,8 +1694,8 @@ void Java_org_rocksdb_Options_setWalBytesPerSync(
  * Method:    walBytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_walBytesPerSync(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1763,8 +1716,8 @@ void Java_org_rocksdb_Options_setStrictBytesPerSync(
  * Method:    strictBytesPerSync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_strictBytesPerSync(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -1855,8 +1808,8 @@ void Java_org_rocksdb_Options_setEnableThreadTracking(
  * Method:    enableThreadTracking
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_enableThreadTracking(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1866,8 +1819,9 @@ jboolean Java_org_rocksdb_Options_enableThreadTracking(
  * Method:    setDelayedWriteRate
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setDelayedWriteRate(
-    JNIEnv*, jobject, jlong jhandle, jlong jdelayed_write_rate) {
+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);
 }
@@ -1877,8 +1831,8 @@ void Java_org_rocksdb_Options_setDelayedWriteRate(
  * Method:    delayedWriteRate
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_delayedWriteRate(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -1899,8 +1853,8 @@ void Java_org_rocksdb_Options_setEnablePipelinedWrite(
  * Method:    enablePipelinedWrite
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_enablePipelinedWrite(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -1910,8 +1864,8 @@ jboolean Java_org_rocksdb_Options_enablePipelinedWrite(
  * Method:    setUnorderedWrite
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setUnorderedWrite(
-    JNIEnv*, jobject, jlong jhandle, jboolean unordered_write) {
+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);
 }
@@ -1921,8 +1875,8 @@ void Java_org_rocksdb_Options_setUnorderedWrite(
  * Method:    unorderedWrite
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_unorderedWrite(
-        JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_unorderedWrite(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->unordered_write;
 }
@@ -1932,8 +1886,9 @@ jboolean Java_org_rocksdb_Options_unorderedWrite(
  * Method:    setAllowConcurrentMemtableWrite
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllowConcurrentMemtableWrite(
-    JNIEnv*, jobject, jlong jhandle, jboolean allow) {
+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);
 }
@@ -1943,8 +1898,8 @@ void Java_org_rocksdb_Options_setAllowConcurrentMemtableWrite(
  * Method:    allowConcurrentMemtableWrite
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowConcurrentMemtableWrite(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_allowConcurrentMemtableWrite(JNIEnv*, jobject,
+                                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->allow_concurrent_memtable_write;
 }
@@ -1976,8 +1931,9 @@ jboolean Java_org_rocksdb_Options_enableWriteThreadAdaptiveYield(
  * Method:    setWriteThreadMaxYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWriteThreadMaxYieldUsec(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -1987,8 +1943,8 @@ void Java_org_rocksdb_Options_setWriteThreadMaxYieldUsec(
  * Method:    writeThreadMaxYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writeThreadMaxYieldUsec(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_writeThreadMaxYieldUsec(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->write_thread_max_yield_usec;
 }
@@ -1998,8 +1954,9 @@ jlong Java_org_rocksdb_Options_writeThreadMaxYieldUsec(
  * Method:    setWriteThreadSlowYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setWriteThreadSlowYieldUsec(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -2009,8 +1966,8 @@ void Java_org_rocksdb_Options_setWriteThreadSlowYieldUsec(
  * Method:    writeThreadSlowYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_writeThreadSlowYieldUsec(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_writeThreadSlowYieldUsec(JNIEnv*, jobject,
+                                                        jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->write_thread_slow_yield_usec;
 }
@@ -2021,8 +1978,7 @@ jlong Java_org_rocksdb_Options_writeThreadSlowYieldUsec(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_Options_setSkipStatsUpdateOnDbOpen(
-    JNIEnv*, jobject, jlong jhandle,
-    jboolean jskip_stats_update_on_db_open) {
+    JNIEnv*, jobject, jlong jhandle, jboolean jskip_stats_update_on_db_open) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->skip_stats_update_on_db_open =
       static_cast<bool>(jskip_stats_update_on_db_open);
@@ -2033,8 +1989,8 @@ void Java_org_rocksdb_Options_setSkipStatsUpdateOnDbOpen(
  * Method:    skipStatsUpdateOnDbOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_skipStatsUpdateOnDbOpen(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -2069,8 +2025,7 @@ jboolean Java_org_rocksdb_Options_skipCheckingSstFileSizesOnDbOpen(
  * Signature: (JB)V
  */
 void Java_org_rocksdb_Options_setWalRecoveryMode(
-    JNIEnv*, jobject, jlong jhandle,
-    jbyte jwal_recovery_mode_value) {
+    JNIEnv*, jobject, jlong jhandle, jbyte jwal_recovery_mode_value) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
   opt->wal_recovery_mode =
       ROCKSDB_NAMESPACE::WALRecoveryModeJni::toCppWALRecoveryMode(
@@ -2082,8 +2037,8 @@ void Java_org_rocksdb_Options_setWalRecoveryMode(
  * Method:    walRecoveryMode
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_walRecoveryMode(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -2094,8 +2049,8 @@ jbyte Java_org_rocksdb_Options_walRecoveryMode(
  * Method:    setAllow2pc
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAllow2pc(
-    JNIEnv*, jobject, jlong jhandle, jboolean jallow_2pc) {
+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);
 }
@@ -2105,8 +2060,7 @@ void Java_org_rocksdb_Options_setAllow2pc(
  * Method:    allow2pc
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allow2pc(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -2116,8 +2070,8 @@ jboolean Java_org_rocksdb_Options_allow2pc(
  * Method:    setRowCache
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setRowCache(
-    JNIEnv*, jobject, jlong jhandle, jlong jrow_cache_handle) {
+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_NAMESPACE::Cache>*>(
@@ -2125,14 +2079,13 @@ void Java_org_rocksdb_Options_setRowCache(
   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) {
+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);
@@ -2156,8 +2109,8 @@ void Java_org_rocksdb_Options_setFailIfOptionsFileError(
  * Method:    failIfOptionsFileError
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_failIfOptionsFileError(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -2167,8 +2120,9 @@ jboolean Java_org_rocksdb_Options_failIfOptionsFileError(
  * Method:    setDumpMallocStats
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setDumpMallocStats(
-    JNIEnv*, jobject, jlong jhandle, jboolean jdump_malloc_stats) {
+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);
 }
@@ -2178,8 +2132,8 @@ void Java_org_rocksdb_Options_setDumpMallocStats(
  * Method:    dumpMallocStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_dumpMallocStats(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -2201,8 +2155,8 @@ void Java_org_rocksdb_Options_setAvoidFlushDuringRecovery(
  * Method:    avoidFlushDuringRecovery
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_avoidFlushDuringRecovery(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -2380,8 +2334,8 @@ void Java_org_rocksdb_Options_setAvoidFlushDuringShutdown(
  * Method:    avoidFlushDuringShutdown
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_avoidFlushDuringShutdown(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -2402,41 +2356,19 @@ void Java_org_rocksdb_Options_setAllowIngestBehind(
  * Method:    allowIngestBehind
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_allowIngestBehind(
-    JNIEnv*, jobject, jlong jhandle) {
+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) {
+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;
 }
@@ -2446,8 +2378,8 @@ void Java_org_rocksdb_Options_setTwoWriteQueues(
  * Method:    twoWriteQueues
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_twoWriteQueues(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -2457,8 +2389,8 @@ jboolean Java_org_rocksdb_Options_twoWriteQueues(
  * Method:    setManualWalFlush
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setManualWalFlush(
-    JNIEnv*, jobject, jlong jhandle, jboolean jmanual_wal_flush) {
+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;
 }
@@ -2468,8 +2400,8 @@ void Java_org_rocksdb_Options_setManualWalFlush(
  * Method:    manualWalFlush
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_manualWalFlush(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -2479,8 +2411,8 @@ jboolean Java_org_rocksdb_Options_manualWalFlush(
  * Method:    setAtomicFlush
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setAtomicFlush(
-    JNIEnv*, jobject, jlong jhandle, jboolean jatomic_flush) {
+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;
 }
@@ -2490,8 +2422,7 @@ void Java_org_rocksdb_Options_setAtomicFlush(
  * Method:    atomicFlush
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_atomicFlush(
-    JNIEnv *, jobject, jlong jhandle) {
+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);
 }
@@ -2500,8 +2431,8 @@ jboolean Java_org_rocksdb_Options_atomicFlush(
  * Method:    tableFactoryName
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_Options_tableFactoryName(
-    JNIEnv* env, jobject, jlong jhandle) {
+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();
 
@@ -2517,8 +2448,8 @@ jstring Java_org_rocksdb_Options_tableFactoryName(
  * Method:    minWriteBufferNumberToMerge
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_minWriteBufferNumberToMerge(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_minWriteBufferNumberToMerge(JNIEnv*, jobject,
+                                                          jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->min_write_buffer_number_to_merge;
 }
@@ -2539,8 +2470,8 @@ void Java_org_rocksdb_Options_setMinWriteBufferNumberToMerge(
  * Method:    maxWriteBufferNumberToMaintain
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_maxWriteBufferNumberToMaintain(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_maxWriteBufferNumberToMaintain(JNIEnv*, jobject,
+                                                             jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_write_buffer_number_to_maintain;
 }
@@ -2576,8 +2507,8 @@ void Java_org_rocksdb_Options_setCompressionType(
  * Method:    compressionType
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_compressionType(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -2684,8 +2615,8 @@ void Java_org_rocksdb_Options_setCompressionPerLevel(
  * Method:    compressionPerLevel
  * Signature: (J)[B
  */
-jbyteArray Java_org_rocksdb_Options_compressionPerLevel(
-    JNIEnv* env, jobject, jlong 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);
 }
@@ -2708,8 +2639,8 @@ void Java_org_rocksdb_Options_setBottommostCompressionType(
  * Method:    bottommostCompressionType
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_bottommostCompressionType(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -2749,8 +2680,9 @@ void Java_org_rocksdb_Options_setCompressionOptions(
  * Method:    setCompactionStyle
  * Signature: (JB)V
  */
-void Java_org_rocksdb_Options_setCompactionStyle(
-    JNIEnv*, jobject, jlong jhandle, jbyte jcompaction_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(
@@ -2762,8 +2694,8 @@ void Java_org_rocksdb_Options_setCompactionStyle(
  * Method:    compactionStyle
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_compactionStyle(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -2786,8 +2718,8 @@ void Java_org_rocksdb_Options_setMaxTableFilesSizeFIFO(
  * Method:    maxTableFilesSizeFIFO
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxTableFilesSizeFIFO(
-    JNIEnv*, jobject, jlong 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;
 }
@@ -2797,8 +2729,7 @@ jlong Java_org_rocksdb_Options_maxTableFilesSizeFIFO(
  * Method:    numLevels
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_numLevels(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_numLevels(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->num_levels;
 }
 
@@ -2807,8 +2738,8 @@ jint Java_org_rocksdb_Options_numLevels(
  * Method:    setNumLevels
  * Signature: (JI)V
  */
-void Java_org_rocksdb_Options_setNumLevels(
-    JNIEnv*, jobject, jlong jhandle, jint jnum_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);
 }
@@ -2818,8 +2749,9 @@ void Java_org_rocksdb_Options_setNumLevels(
  * Method:    levelZeroFileNumCompactionTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_levelZeroFileNumCompactionTrigger(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_levelZeroFileNumCompactionTrigger(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger;
 }
@@ -2830,8 +2762,7 @@ jint Java_org_rocksdb_Options_levelZeroFileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevelZeroFileNumCompactionTrigger(
-    JNIEnv*, jobject, jlong jhandle,
-    jint jlevel0_file_num_compaction_trigger) {
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_file_num_compaction_trigger) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int>(jlevel0_file_num_compaction_trigger);
@@ -2842,8 +2773,8 @@ void Java_org_rocksdb_Options_setLevelZeroFileNumCompactionTrigger(
  * Method:    levelZeroSlowdownWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_levelZeroSlowdownWritesTrigger(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_levelZeroSlowdownWritesTrigger(JNIEnv*, jobject,
+                                                             jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_slowdown_writes_trigger;
 }
@@ -2865,8 +2796,8 @@ void Java_org_rocksdb_Options_setLevelZeroSlowdownWritesTrigger(
  * Method:    levelZeroStopWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_levelZeroStopWritesTrigger(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_levelZeroStopWritesTrigger(JNIEnv*, jobject,
+                                                         jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_stop_writes_trigger;
 }
@@ -2888,8 +2819,8 @@ void Java_org_rocksdb_Options_setLevelZeroStopWritesTrigger(
  * Method:    targetFileSizeBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_targetFileSizeBase(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_targetFileSizeBase(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->target_file_size_base;
 }
@@ -2910,8 +2841,8 @@ void Java_org_rocksdb_Options_setTargetFileSizeBase(
  * Method:    targetFileSizeMultiplier
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_targetFileSizeMultiplier(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_targetFileSizeMultiplier(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->target_file_size_multiplier;
 }
@@ -2933,8 +2864,8 @@ void Java_org_rocksdb_Options_setTargetFileSizeMultiplier(
  * Method:    maxBytesForLevelBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxBytesForLevelBase(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxBytesForLevelBase(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_bytes_for_level_base;
 }
@@ -2978,8 +2909,8 @@ void Java_org_rocksdb_Options_setLevelCompactionDynamicLevelBytes(
  * Method:    maxBytesForLevelMultiplier
  * Signature: (J)D
  */
-jdouble Java_org_rocksdb_Options_maxBytesForLevelMultiplier(
-    JNIEnv*, jobject, jlong jhandle) {
+jdouble Java_org_rocksdb_Options_maxBytesForLevelMultiplier(JNIEnv*, jobject,
+                                                            jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_bytes_for_level_multiplier;
 }
@@ -3001,8 +2932,8 @@ void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplier(
  * Method:    maxCompactionBytes
  * Signature: (J)I
  */
-jlong Java_org_rocksdb_Options_maxCompactionBytes(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxCompactionBytes(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return static_cast<jlong>(
       reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
           ->max_compaction_bytes);
@@ -3024,8 +2955,7 @@ void Java_org_rocksdb_Options_setMaxCompactionBytes(
  * Method:    arenaBlockSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_arenaBlockSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_arenaBlockSize(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->arena_block_size;
 }
@@ -3035,8 +2965,9 @@ jlong Java_org_rocksdb_Options_arenaBlockSize(
  * Method:    setArenaBlockSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setArenaBlockSize(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -3052,8 +2983,8 @@ void Java_org_rocksdb_Options_setArenaBlockSize(
  * Method:    disableAutoCompactions
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_disableAutoCompactions(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_disableAutoCompactions(JNIEnv*, jobject,
+                                                         jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->disable_auto_compactions;
 }
@@ -3074,8 +3005,8 @@ void Java_org_rocksdb_Options_setDisableAutoCompactions(
  * Method:    maxSequentialSkipInIterations
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_maxSequentialSkipInIterations(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_maxSequentialSkipInIterations(JNIEnv*, jobject,
+                                                             jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_sequential_skip_in_iterations;
 }
@@ -3086,8 +3017,7 @@ jlong Java_org_rocksdb_Options_maxSequentialSkipInIterations(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setMaxSequentialSkipInIterations(
-    JNIEnv*, jobject, jlong jhandle,
-    jlong jmax_sequential_skip_in_iterations) {
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_sequential_skip_in_iterations) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->max_sequential_skip_in_iterations =
       static_cast<int64_t>(jmax_sequential_skip_in_iterations);
@@ -3098,8 +3028,8 @@ void Java_org_rocksdb_Options_setMaxSequentialSkipInIterations(
  * Method:    inplaceUpdateSupport
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_inplaceUpdateSupport(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_inplaceUpdateSupport(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->inplace_update_support;
 }
@@ -3120,8 +3050,8 @@ void Java_org_rocksdb_Options_setInplaceUpdateSupport(
  * Method:    inplaceUpdateNumLocks
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_inplaceUpdateNumLocks(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_inplaceUpdateNumLocks(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->inplace_update_num_locks;
 }
@@ -3148,8 +3078,8 @@ void Java_org_rocksdb_Options_setInplaceUpdateNumLocks(
  * Method:    memtablePrefixBloomSizeRatio
  * Signature: (J)I
  */
-jdouble Java_org_rocksdb_Options_memtablePrefixBloomSizeRatio(
-    JNIEnv*, jobject, jlong jhandle) {
+jdouble Java_org_rocksdb_Options_memtablePrefixBloomSizeRatio(JNIEnv*, jobject,
+                                                              jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->memtable_prefix_bloom_size_ratio;
 }
@@ -3169,49 +3099,94 @@ void Java_org_rocksdb_Options_setMemtablePrefixBloomSizeRatio(
 
 /*
  * Class:     org_rocksdb_Options
- * Method:    bloomLocality
+ * Method:    experimentalMempurgeThreshold
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_bloomLocality(
-    JNIEnv*, jobject, jlong jhandle) {
-  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bloom_locality;
+jdouble Java_org_rocksdb_Options_experimentalMempurgeThreshold(JNIEnv*, jobject,
+                                                               jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->experimental_mempurge_threshold;
 }
 
 /*
  * Class:     org_rocksdb_Options
- * Method:    setBloomLocality
+ * Method:    setExperimentalMempurgeThreshold
  * Signature: (JI)V
  */
-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);
+void Java_org_rocksdb_Options_setExperimentalMempurgeThreshold(
+    JNIEnv*, jobject, jlong jhandle, jdouble jexperimental_mempurge_threshold) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->experimental_mempurge_threshold =
+      static_cast<double>(jexperimental_mempurge_threshold);
 }
 
 /*
  * Class:     org_rocksdb_Options
- * Method:    maxSuccessiveMerges
- * Signature: (J)J
+ * Method:    memtableWholeKeyFiltering
+ * Signature: (J)Z
  */
-jlong Java_org_rocksdb_Options_maxSuccessiveMerges(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_memtableWholeKeyFiltering(JNIEnv*, jobject,
+                                                            jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
-      ->max_successive_merges;
+      ->memtable_whole_key_filtering;
 }
 
 /*
  * Class:     org_rocksdb_Options
- * Method:    setMaxSuccessiveMerges
- * Signature: (JJ)V
+ * Method:    setMemtableWholeKeyFiltering
+ * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setMaxSuccessiveMerges(
-    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_NAMESPACE::Options*>(jhandle)
-        ->max_successive_merges = jmax_successive_merges;
-  } else {
+void Java_org_rocksdb_Options_setMemtableWholeKeyFiltering(
+    JNIEnv*, jobject, jlong jhandle, jboolean jmemtable_whole_key_filtering) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->memtable_whole_key_filtering =
+      static_cast<bool>(jmemtable_whole_key_filtering);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    bloomLocality
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_Options_bloomLocality(JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->bloom_locality;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBloomLocality
+ * Signature: (JI)V
+ */
+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);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    maxSuccessiveMerges
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_maxSuccessiveMerges(JNIEnv*, jobject,
+                                                   jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
+      ->max_successive_merges;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setMaxSuccessiveMerges
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setMaxSuccessiveMerges(
+    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_NAMESPACE::Options*>(jhandle)
+        ->max_successive_merges = jmax_successive_merges;
+  } else {
     ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
   }
 }
@@ -3221,8 +3196,8 @@ void Java_org_rocksdb_Options_setMaxSuccessiveMerges(
  * Method:    optimizeFiltersForHits
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_optimizeFiltersForHits(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_optimizeFiltersForHits(JNIEnv*, jobject,
+                                                         jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->optimize_filters_for_hits;
 }
@@ -3316,8 +3291,8 @@ void Java_org_rocksdb_Options_optimizeUniversalStyleCompaction(
  * Method:    prepareForBulkLoad
  * Signature: (J)V
  */
-void Java_org_rocksdb_Options_prepareForBulkLoad(
-    JNIEnv*, jobject, jlong jhandle) {
+void Java_org_rocksdb_Options_prepareForBulkLoad(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)->PrepareForBulkLoad();
 }
 
@@ -3326,8 +3301,8 @@ void Java_org_rocksdb_Options_prepareForBulkLoad(
  * Method:    memtableHugePageSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_memtableHugePageSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_memtableHugePageSize(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->memtable_huge_page_size;
 }
@@ -3354,8 +3329,8 @@ void Java_org_rocksdb_Options_setMemtableHugePageSize(
  * Method:    softPendingCompactionBytesLimit
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_softPendingCompactionBytesLimit(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_softPendingCompactionBytesLimit(JNIEnv*, jobject,
+                                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->soft_pending_compaction_bytes_limit;
 }
@@ -3378,8 +3353,8 @@ void Java_org_rocksdb_Options_setSoftPendingCompactionBytesLimit(
  * Method:    softHardCompactionBytesLimit
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_hardPendingCompactionBytesLimit(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_Options_hardPendingCompactionBytesLimit(JNIEnv*, jobject,
+                                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->hard_pending_compaction_bytes_limit;
 }
@@ -3402,8 +3377,8 @@ void Java_org_rocksdb_Options_setHardPendingCompactionBytesLimit(
  * Method:    level0FileNumCompactionTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_level0FileNumCompactionTrigger(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_level0FileNumCompactionTrigger(JNIEnv*, jobject,
+                                                             jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger;
 }
@@ -3414,8 +3389,7 @@ jint Java_org_rocksdb_Options_level0FileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_Options_setLevel0FileNumCompactionTrigger(
-    JNIEnv*, jobject, jlong jhandle,
-    jint jlevel0_file_num_compaction_trigger) {
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_file_num_compaction_trigger) {
   reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int32_t>(jlevel0_file_num_compaction_trigger);
@@ -3426,8 +3400,8 @@ void Java_org_rocksdb_Options_setLevel0FileNumCompactionTrigger(
  * Method:    level0SlowdownWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_level0SlowdownWritesTrigger(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_level0SlowdownWritesTrigger(JNIEnv*, jobject,
+                                                          jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_slowdown_writes_trigger;
 }
@@ -3449,8 +3423,8 @@ void Java_org_rocksdb_Options_setLevel0SlowdownWritesTrigger(
  * Method:    level0StopWritesTrigger
  * Signature: (J)I
  */
-jint Java_org_rocksdb_Options_level0StopWritesTrigger(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_Options_level0StopWritesTrigger(JNIEnv*, jobject,
+                                                      jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->level0_stop_writes_trigger;
 }
@@ -3537,8 +3511,8 @@ void Java_org_rocksdb_Options_setMaxBytesForLevelMultiplierAdditional(
  * Method:    paranoidFileChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_paranoidFileChecks(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_Options_paranoidFileChecks(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle)
       ->paranoid_file_checks;
 }
@@ -3572,8 +3546,8 @@ void Java_org_rocksdb_Options_setCompactionPriority(
  * Method:    compactionPriority
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_Options_compactionPriority(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -3584,8 +3558,9 @@ jbyte Java_org_rocksdb_Options_compactionPriority(
  * Method:    setReportBgIoStats
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_Options_setReportBgIoStats(
-    JNIEnv*, jobject, jlong jhandle, jboolean jreport_bg_io_stats) {
+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);
 }
@@ -3595,8 +3570,8 @@ void Java_org_rocksdb_Options_setReportBgIoStats(
  * Method:    reportBgIoStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_reportBgIoStats(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -3606,8 +3581,8 @@ jboolean Java_org_rocksdb_Options_reportBgIoStats(
  * Method:    setTtl
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_Options_setTtl(
-    JNIEnv*, jobject, jlong jhandle, jlong jttl) {
+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);
 }
@@ -3617,12 +3592,34 @@ void Java_org_rocksdb_Options_setTtl(
  * Method:    ttl
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_Options_ttl(
-    JNIEnv*, jobject, jlong jhandle) {
+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:    setPeriodicCompactionSeconds
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setPeriodicCompactionSeconds(
+    JNIEnv*, jobject, jlong jhandle, jlong jperiodicCompactionSeconds) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->periodic_compaction_seconds =
+      static_cast<uint64_t>(jperiodicCompactionSeconds);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    periodicCompactionSeconds
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_periodicCompactionSeconds(JNIEnv*, jobject,
+                                                         jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jlong>(opts->periodic_compaction_seconds);
+}
+
 /*
  * Class:     org_rocksdb_Options
  * Method:    setCompactionOptionsUniversal
@@ -3667,12 +3664,246 @@ void Java_org_rocksdb_Options_setForceConsistencyChecks(
  * Method:    forceConsistencyChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_Options_forceConsistencyChecks(
-    JNIEnv*, jobject, jlong 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);
 }
 
+/// BLOB options
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setEnableBlobFiles
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setEnableBlobFiles(JNIEnv*, jobject,
+                                                 jlong jhandle,
+                                                 jboolean jenable_blob_files) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->enable_blob_files = static_cast<bool>(jenable_blob_files);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    enableBlobFiles
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_enableBlobFiles(JNIEnv*, jobject,
+                                                  jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opts->enable_blob_files);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setMinBlobSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setMinBlobSize(JNIEnv*, jobject, jlong jhandle,
+                                             jlong jmin_blob_size) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->min_blob_size = static_cast<uint64_t>(jmin_blob_size);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    minBlobSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_minBlobSize(JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jlong>(opts->min_blob_size);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBlobFileSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setBlobFileSize(JNIEnv*, jobject, jlong jhandle,
+                                              jlong jblob_file_size) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->blob_file_size = static_cast<uint64_t>(jblob_file_size);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    blobFileSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_blobFileSize(JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jlong>(opts->blob_file_size);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBlobCompressionType
+ * Signature: (JB)V
+ */
+void Java_org_rocksdb_Options_setBlobCompressionType(
+    JNIEnv*, jobject, jlong jhandle, jbyte jblob_compression_type_value) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->blob_compression_type =
+      ROCKSDB_NAMESPACE::CompressionTypeJni::toCppCompressionType(
+          jblob_compression_type_value);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    blobCompressionType
+ * Signature: (J)B
+ */
+jbyte Java_org_rocksdb_Options_blobCompressionType(JNIEnv*, jobject,
+                                                   jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
+      opts->blob_compression_type);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setEnableBlobGarbageCollection
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_Options_setEnableBlobGarbageCollection(
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_blob_garbage_collection) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->enable_blob_garbage_collection =
+      static_cast<bool>(jenable_blob_garbage_collection);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    enableBlobGarbageCollection
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_Options_enableBlobGarbageCollection(JNIEnv*, jobject,
+                                                              jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jboolean>(opts->enable_blob_garbage_collection);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBlobGarbageCollectionAgeCutoff
+ * Signature: (JD)V
+ */
+void Java_org_rocksdb_Options_setBlobGarbageCollectionAgeCutoff(
+    JNIEnv*, jobject, jlong jhandle,
+    jdouble jblob_garbage_collection_age_cutoff) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->blob_garbage_collection_age_cutoff =
+      static_cast<double>(jblob_garbage_collection_age_cutoff);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    blobGarbageCollectionAgeCutoff
+ * Signature: (J)D
+ */
+jdouble Java_org_rocksdb_Options_blobGarbageCollectionAgeCutoff(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jdouble>(opts->blob_garbage_collection_age_cutoff);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBlobGarbageCollectionForceThreshold
+ * Signature: (JD)V
+ */
+void Java_org_rocksdb_Options_setBlobGarbageCollectionForceThreshold(
+    JNIEnv*, jobject, jlong jhandle,
+    jdouble jblob_garbage_collection_force_threshold) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->blob_garbage_collection_force_threshold =
+      static_cast<double>(jblob_garbage_collection_force_threshold);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    blobGarbageCollectionForceThreshold
+ * Signature: (J)D
+ */
+jdouble Java_org_rocksdb_Options_blobGarbageCollectionForceThreshold(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jdouble>(opts->blob_garbage_collection_force_threshold);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBlobCompactionReadaheadSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_Options_setBlobCompactionReadaheadSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jblob_compaction_readahead_size) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->blob_compaction_readahead_size =
+      static_cast<uint64_t>(jblob_compaction_readahead_size);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    blobCompactionReadaheadSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_Options_blobCompactionReadaheadSize(JNIEnv*, jobject,
+                                                           jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jlong>(opts->blob_compaction_readahead_size);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setBlobFileStartingLevel
+ * Signature: (JI)V
+ */
+void Java_org_rocksdb_Options_setBlobFileStartingLevel(
+    JNIEnv*, jobject, jlong jhandle, jint jblob_file_starting_level) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->blob_file_starting_level = jblob_file_starting_level;
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    blobFileStartingLevel
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_Options_blobFileStartingLevel(JNIEnv*, jobject,
+                                                    jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return static_cast<jint>(opts->blob_file_starting_level);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    setPrepopulateBlobCache
+ * Signature: (JB)V
+ */
+void Java_org_rocksdb_Options_setPrepopulateBlobCache(
+    JNIEnv*, jobject, jlong jhandle, jbyte jprepopulate_blob_cache_value) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  opts->prepopulate_blob_cache =
+      ROCKSDB_NAMESPACE::PrepopulateBlobCacheJni::toCppPrepopulateBlobCache(
+          jprepopulate_blob_cache_value);
+}
+
+/*
+ * Class:     org_rocksdb_Options
+ * Method:    prepopulateBlobCache
+ * Signature: (J)B
+ */
+jbyte Java_org_rocksdb_Options_prepopulateBlobCache(JNIEnv*, jobject,
+                                                    jlong jhandle) {
+  auto* opts = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(jhandle);
+  return ROCKSDB_NAMESPACE::PrepopulateBlobCacheJni::toJavaPrepopulateBlobCache(
+      opts->prepopulate_blob_cache);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ROCKSDB_NAMESPACE::ColumnFamilyOptions
 
@@ -3681,10 +3912,10 @@ jboolean Java_org_rocksdb_Options_forceConsistencyChecks(
  * Method:    newColumnFamilyOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_newColumnFamilyOptions(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_newColumnFamilyOptions(JNIEnv*,
+                                                                  jclass) {
   auto* op = new ROCKSDB_NAMESPACE::ColumnFamilyOptions();
-  return reinterpret_cast<jlong>(op);
+  return GET_CPLUSPLUS_POINTER(op);
 }
 
 /*
@@ -3696,7 +3927,7 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_copyColumnFamilyOptions(
     JNIEnv*, jclass, jlong jhandle) {
   auto new_opt = new ROCKSDB_NAMESPACE::ColumnFamilyOptions(
       *(reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)));
-  return reinterpret_cast<jlong>(new_opt);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -3708,7 +3939,7 @@ 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);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -3736,7 +3967,7 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_getColumnFamilyOptionsFromProps__JLja
   // Check if ColumnFamilyOptions creation was possible.
   jlong ret_value = 0;
   if (status.ok()) {
-    ret_value = reinterpret_cast<jlong>(cf_options);
+    ret_value = GET_CPLUSPLUS_POINTER(cf_options);
   } else {
     // if operation failed the ColumnFamilyOptions need to be deleted
     // again to prevent a memory leak.
@@ -3768,7 +3999,7 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_getColumnFamilyOptionsFromProps__Ljav
   // Check if ColumnFamilyOptions creation was possible.
   jlong ret_value = 0;
   if (status.ok()) {
-    ret_value = reinterpret_cast<jlong>(cf_options);
+    ret_value = GET_CPLUSPLUS_POINTER(cf_options);
   } else {
     // if operation failed the ColumnFamilyOptions need to be deleted
     // again to prevent a memory leak.
@@ -3782,8 +4013,8 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_getColumnFamilyOptionsFromProps__Ljav
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_disposeInternal(
-    JNIEnv*, jobject, jlong handle) {
+void Java_org_rocksdb_ColumnFamilyOptions_disposeInternal(JNIEnv*, jobject,
+                                                          jlong handle) {
   auto* cfo = reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(handle);
   assert(cfo != nullptr);
   delete cfo;
@@ -3990,8 +4221,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setWriteBufferSize(
  * Method:    writeBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_writeBufferSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_writeBufferSize(JNIEnv*, jobject,
+                                                           jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->write_buffer_size;
 }
@@ -4012,8 +4243,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxWriteBufferNumber(
  * Method:    maxWriteBufferNumber
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumber(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_ColumnFamilyOptions_maxWriteBufferNumber(JNIEnv*, jobject,
+                                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_write_buffer_number;
 }
@@ -4094,9 +4325,10 @@ void Java_org_rocksdb_ColumnFamilyOptions_setSstPartitionerFactory(
     JNIEnv*, jobject, jlong jhandle, jlong factory_handle) {
   auto* options =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
-  auto* factory = reinterpret_cast<ROCKSDB_NAMESPACE::SstPartitionerFactory*>(
+  auto factory = reinterpret_cast<
+      std::shared_ptr<ROCKSDB_NAMESPACE::SstPartitionerFactory>*>(
       factory_handle);
-  options->sst_partitioner_factory.reset(factory);
+  options->sst_partitioner_factory = *factory;
 }
 
 /*
@@ -4118,8 +4350,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionThreadLimiter(
  * Method:    tableFactoryName
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_ColumnFamilyOptions_tableFactoryName(
-    JNIEnv* env, jobject, jlong jhandle) {
+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();
@@ -4142,7 +4375,7 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCfPaths(JNIEnv* env, jclass,
                                                      jlongArray size_array) {
   auto* options =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
-  jboolean has_exception;
+  jboolean has_exception = JNI_FALSE;
   std::vector<ROCKSDB_NAMESPACE::DbPath> cf_paths =
       rocksdb_convert_cf_paths_from_java_helper(env, path_array, size_array,
                                                 &has_exception);
@@ -4243,8 +4476,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompressionType(
  * Method:    compressionType
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ColumnFamilyOptions_compressionType(
-    JNIEnv*, jobject, jlong jhandle) {
+jbyte Java_org_rocksdb_ColumnFamilyOptions_compressionType(JNIEnv*, jobject,
+                                                           jlong jhandle) {
   auto* cf_opts =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
@@ -4358,8 +4591,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionStyle(
  * Method:    compactionStyle
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionStyle(
-    JNIEnv*, jobject, jlong jhandle) {
+jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionStyle(JNIEnv*, jobject,
+                                                           jlong jhandle) {
   auto* cf_options =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   return ROCKSDB_NAMESPACE::CompactionStyleJni::toJavaCompactionStyle(
@@ -4394,8 +4627,8 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxTableFilesSizeFIFO(
  * Method:    numLevels
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ColumnFamilyOptions_numLevels(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_ColumnFamilyOptions_numLevels(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->num_levels;
 }
@@ -4405,8 +4638,9 @@ jint Java_org_rocksdb_ColumnFamilyOptions_numLevels(
  * Method:    setNumLevels
  * Signature: (JI)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_setNumLevels(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -4428,8 +4662,7 @@ jint Java_org_rocksdb_ColumnFamilyOptions_levelZeroFileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroFileNumCompactionTrigger(
-    JNIEnv*, jobject, jlong jhandle,
-    jint jlevel0_file_num_compaction_trigger) {
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_file_num_compaction_trigger) {
   reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int>(jlevel0_file_num_compaction_trigger);
@@ -4486,8 +4719,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevelZeroStopWritesTrigger(
  * Method:    targetFileSizeBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeBase(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_targetFileSizeBase(JNIEnv*, jobject,
+                                                              jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->target_file_size_base;
 }
@@ -4531,8 +4764,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setTargetFileSizeMultiplier(
  * Method:    maxBytesForLevelBase
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelBase(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelBase(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_bytes_for_level_base;
 }
@@ -4599,8 +4833,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxBytesForLevelMultiplier(
  * Method:    maxCompactionBytes
  * Signature: (J)I
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_maxCompactionBytes(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_maxCompactionBytes(JNIEnv*, jobject,
+                                                              jlong jhandle) {
   return static_cast<jlong>(
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
           ->max_compaction_bytes);
@@ -4622,8 +4856,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMaxCompactionBytes(
  * Method:    arenaBlockSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_arenaBlockSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_arenaBlockSize(JNIEnv*, jobject,
+                                                          jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->arena_block_size;
 }
@@ -4684,8 +4918,7 @@ jlong Java_org_rocksdb_ColumnFamilyOptions_maxSequentialSkipInIterations(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setMaxSequentialSkipInIterations(
-    JNIEnv*, jobject, jlong jhandle,
-    jlong jmax_sequential_skip_in_iterations) {
+    JNIEnv*, jobject, jlong jhandle, jlong jmax_sequential_skip_in_iterations) {
   reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_sequential_skip_in_iterations =
       static_cast<int64_t>(jmax_sequential_skip_in_iterations);
@@ -4767,11 +5000,57 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMemtablePrefixBloomSizeRatio(
 
 /*
  * Class:     org_rocksdb_ColumnFamilyOptions
- * Method:    bloomLocality
+ * Method:    experimentalMempurgeThreshold
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ColumnFamilyOptions_bloomLocality(
+jdouble Java_org_rocksdb_ColumnFamilyOptions_experimentalMempurgeThreshold(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->experimental_mempurge_threshold;
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setExperimentalMempurgeThreshold
+ * Signature: (JI)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setExperimentalMempurgeThreshold(
+    JNIEnv*, jobject, jlong jhandle, jdouble jexperimental_mempurge_threshold) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->experimental_mempurge_threshold =
+      static_cast<double>(jexperimental_mempurge_threshold);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    memtableWholeKeyFiltering
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_ColumnFamilyOptions_memtableWholeKeyFiltering(
     JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->memtable_whole_key_filtering;
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setMemtableWholeKeyFiltering
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setMemtableWholeKeyFiltering(
+    JNIEnv*, jobject, jlong jhandle, jboolean jmemtable_whole_key_filtering) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
+      ->memtable_whole_key_filtering =
+      static_cast<bool>(jmemtable_whole_key_filtering);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    bloomLocality
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_ColumnFamilyOptions_bloomLocality(JNIEnv*, jobject,
+                                                        jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->bloom_locality;
 }
@@ -4792,8 +5071,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setBloomLocality(
  * Method:    maxSuccessiveMerges
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_maxSuccessiveMerges(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_maxSuccessiveMerges(JNIEnv*, jobject,
+                                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->max_successive_merges;
 }
@@ -4843,8 +5122,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setOptimizeFiltersForHits(
  * Method:    memtableHugePageSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ColumnFamilyOptions_memtableHugePageSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ColumnFamilyOptions_memtableHugePageSize(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->memtable_huge_page_size;
 }
@@ -4931,8 +5211,7 @@ jint Java_org_rocksdb_ColumnFamilyOptions_level0FileNumCompactionTrigger(
  * Signature: (JI)V
  */
 void Java_org_rocksdb_ColumnFamilyOptions_setLevel0FileNumCompactionTrigger(
-    JNIEnv*, jobject, jlong jhandle,
-    jint jlevel0_file_num_compaction_trigger) {
+    JNIEnv*, jobject, jlong jhandle, jint jlevel0_file_num_compaction_trigger) {
   reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
       ->level0_file_num_compaction_trigger =
       static_cast<int32_t>(jlevel0_file_num_compaction_trigger);
@@ -4989,7 +5268,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setLevel0StopWritesTrigger(
  * Method:    maxBytesForLevelMultiplierAdditional
  * Signature: (J)[I
  */
-jintArray Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplierAdditional(
+jintArray
+Java_org_rocksdb_ColumnFamilyOptions_maxBytesForLevelMultiplierAdditional(
     JNIEnv* env, jobject, jlong jhandle) {
   auto mbflma =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle)
@@ -5091,8 +5371,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setCompactionPriority(
  * Method:    compactionPriority
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionPriority(
-    JNIEnv*, jobject, jlong jhandle) {
+jbyte Java_org_rocksdb_ColumnFamilyOptions_compactionPriority(JNIEnv*, jobject,
+                                                              jlong jhandle) {
   auto* cf_opts =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
   return ROCKSDB_NAMESPACE::CompactionPriorityJni::toJavaCompactionPriority(
@@ -5116,8 +5396,8 @@ void Java_org_rocksdb_ColumnFamilyOptions_setReportBgIoStats(
  * Method:    reportBgIoStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ColumnFamilyOptions_reportBgIoStats(
-    JNIEnv*, jobject, jlong 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);
@@ -5128,8 +5408,8 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_reportBgIoStats(
  * Method:    setTtl
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_setTtl(
-    JNIEnv*, jobject, jlong jhandle, jlong jttl) {
+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);
@@ -5140,13 +5420,39 @@ void Java_org_rocksdb_ColumnFamilyOptions_setTtl(
  * Method:    ttl
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_org_rocksdb_ColumnFamilyOptions_ttl(
-    JNIEnv*, jobject, jlong jhandle) {
+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:    setPeriodicCompactionSeconds
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setPeriodicCompactionSeconds(
+    JNIEnv*, jobject, jlong jhandle, jlong jperiodicCompactionSeconds) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  cf_opts->periodic_compaction_seconds =
+      static_cast<uint64_t>(jperiodicCompactionSeconds);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    periodicCompactionSeconds
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL
+Java_org_rocksdb_ColumnFamilyOptions_periodicCompactionSeconds(JNIEnv*, jobject,
+                                                               jlong jhandle) {
+  auto* cf_opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jlong>(cf_opts->periodic_compaction_seconds);
+}
+
 /*
  * Class:     org_rocksdb_ColumnFamilyOptions
  * Method:    setCompactionOptionsUniversal
@@ -5199,7 +5505,265 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_forceConsistencyChecks(
     JNIEnv*, jobject, jlong jhandle) {
   auto* cf_opts =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
-  return static_cast<bool>(cf_opts->force_consistency_checks);
+  return static_cast<jboolean>(cf_opts->force_consistency_checks);
+}
+
+/// BLOB options
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setEnableBlobFiles
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setEnableBlobFiles(
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_blob_files) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->enable_blob_files = static_cast<bool>(jenable_blob_files);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    enableBlobFiles
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_ColumnFamilyOptions_enableBlobFiles(JNIEnv*, jobject,
+                                                              jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jboolean>(opts->enable_blob_files);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setMinBlobSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setMinBlobSize(JNIEnv*, jobject,
+                                                         jlong jhandle,
+                                                         jlong jmin_blob_size) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->min_blob_size = static_cast<uint64_t>(jmin_blob_size);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    minBlobSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ColumnFamilyOptions_minBlobSize(JNIEnv*, jobject,
+                                                       jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jlong>(opts->min_blob_size);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setBlobFileSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setBlobFileSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jblob_file_size) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->blob_file_size = static_cast<uint64_t>(jblob_file_size);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    blobFileSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ColumnFamilyOptions_blobFileSize(JNIEnv*, jobject,
+                                                        jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jlong>(opts->blob_file_size);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setBlobCompressionType
+ * Signature: (JB)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setBlobCompressionType(
+    JNIEnv*, jobject, jlong jhandle, jbyte jblob_compression_type_value) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->blob_compression_type =
+      ROCKSDB_NAMESPACE::CompressionTypeJni::toCppCompressionType(
+          jblob_compression_type_value);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    blobCompressionType
+ * Signature: (J)B
+ */
+jbyte Java_org_rocksdb_ColumnFamilyOptions_blobCompressionType(JNIEnv*, jobject,
+                                                               jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::CompressionTypeJni::toJavaCompressionType(
+      opts->blob_compression_type);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setEnableBlobGarbageCollection
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setEnableBlobGarbageCollection(
+    JNIEnv*, jobject, jlong jhandle, jboolean jenable_blob_garbage_collection) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->enable_blob_garbage_collection =
+      static_cast<bool>(jenable_blob_garbage_collection);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    enableBlobGarbageCollection
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_ColumnFamilyOptions_enableBlobGarbageCollection(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jboolean>(opts->enable_blob_garbage_collection);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setBlobGarbageCollectionAgeCutoff
+ * Signature: (JD)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setBlobGarbageCollectionAgeCutoff(
+    JNIEnv*, jobject, jlong jhandle,
+    jdouble jblob_garbage_collection_age_cutoff) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->blob_garbage_collection_age_cutoff =
+      static_cast<double>(jblob_garbage_collection_age_cutoff);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    blobGarbageCollectionAgeCutoff
+ * Signature: (J)D
+ */
+jdouble Java_org_rocksdb_ColumnFamilyOptions_blobGarbageCollectionAgeCutoff(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jdouble>(opts->blob_garbage_collection_age_cutoff);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setBlobGarbageCollectionForceThreshold
+ * Signature: (JD)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setBlobGarbageCollectionForceThreshold(
+    JNIEnv*, jobject, jlong jhandle,
+    jdouble jblob_garbage_collection_force_threshold) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->blob_garbage_collection_force_threshold =
+      static_cast<double>(jblob_garbage_collection_force_threshold);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    blobGarbageCollectionForceThreshold
+ * Signature: (J)D
+ */
+jdouble
+Java_org_rocksdb_ColumnFamilyOptions_blobGarbageCollectionForceThreshold(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jdouble>(opts->blob_garbage_collection_force_threshold);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setBlobCompactionReadaheadSize
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setBlobCompactionReadaheadSize(
+    JNIEnv*, jobject, jlong jhandle, jlong jblob_compaction_readahead_size) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->blob_compaction_readahead_size =
+      static_cast<uint64_t>(jblob_compaction_readahead_size);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    blobCompactionReadaheadSize
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ColumnFamilyOptions_blobCompactionReadaheadSize(
+    JNIEnv*, jobject, jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jlong>(opts->blob_compaction_readahead_size);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setBlobFileStartingLevel
+ * Signature: (JI)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setBlobFileStartingLevel(
+    JNIEnv*, jobject, jlong jhandle, jint jblob_file_starting_level) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->blob_file_starting_level = jblob_file_starting_level;
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    blobFileStartingLevel
+ * Signature: (J)I
+ */
+jint Java_org_rocksdb_ColumnFamilyOptions_blobFileStartingLevel(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return static_cast<jint>(opts->blob_file_starting_level);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    setPrepopulateBlobCache
+ * Signature: (JB)V
+ */
+void Java_org_rocksdb_ColumnFamilyOptions_setPrepopulateBlobCache(
+    JNIEnv*, jobject, jlong jhandle, jbyte jprepopulate_blob_cache_value) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  opts->prepopulate_blob_cache =
+      ROCKSDB_NAMESPACE::PrepopulateBlobCacheJni::toCppPrepopulateBlobCache(
+          jprepopulate_blob_cache_value);
+}
+
+/*
+ * Class:     org_rocksdb_ColumnFamilyOptions
+ * Method:    prepopulateBlobCache
+ * Signature: (J)B
+ */
+jbyte Java_org_rocksdb_ColumnFamilyOptions_prepopulateBlobCache(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
+  auto* opts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyOptions*>(jhandle);
+  return ROCKSDB_NAMESPACE::PrepopulateBlobCacheJni::toJavaPrepopulateBlobCache(
+      opts->prepopulate_blob_cache);
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -5210,10 +5774,9 @@ jboolean Java_org_rocksdb_ColumnFamilyOptions_forceConsistencyChecks(
  * Method:    newDBOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_DBOptions_newDBOptions(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_DBOptions_newDBOptions(JNIEnv*, jclass) {
   auto* dbop = new ROCKSDB_NAMESPACE::DBOptions();
-  return reinterpret_cast<jlong>(dbop);
+  return GET_CPLUSPLUS_POINTER(dbop);
 }
 
 /*
@@ -5221,11 +5784,10 @@ jlong Java_org_rocksdb_DBOptions_newDBOptions(
  * Method:    copyDBOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_copyDBOptions(
-    JNIEnv*, jclass, jlong 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);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -5237,7 +5799,7 @@ 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);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -5264,7 +5826,7 @@ jlong Java_org_rocksdb_DBOptions_getDBOptionsFromProps__JLjava_lang_String_2(
   // Check if DBOptions creation was possible.
   jlong ret_value = 0;
   if (status.ok()) {
-    ret_value = reinterpret_cast<jlong>(db_options);
+    ret_value = GET_CPLUSPLUS_POINTER(db_options);
   } else {
     // if operation failed the DBOptions need to be deleted
     // again to prevent a memory leak.
@@ -5295,7 +5857,7 @@ jlong Java_org_rocksdb_DBOptions_getDBOptionsFromProps__Ljava_lang_String_2(
   // Check if DBOptions creation was possible.
   jlong ret_value = 0;
   if (status.ok()) {
-    ret_value = reinterpret_cast<jlong>(db_options);
+    ret_value = GET_CPLUSPLUS_POINTER(db_options);
   } else {
     // if operation failed the DBOptions need to be deleted
     // again to prevent a memory leak.
@@ -5309,8 +5871,8 @@ jlong Java_org_rocksdb_DBOptions_getDBOptionsFromProps__Ljava_lang_String_2(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_DBOptions_disposeInternal(
-    JNIEnv*, jobject, jlong handle) {
+void Java_org_rocksdb_DBOptions_disposeInternal(JNIEnv*, jobject,
+                                                jlong handle) {
   auto* dbo = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(handle);
   assert(dbo != nullptr);
   delete dbo;
@@ -5321,8 +5883,8 @@ void Java_org_rocksdb_DBOptions_disposeInternal(
  * Method:    optimizeForSmallDb
  * Signature: (J)V
  */
-void Java_org_rocksdb_DBOptions_optimizeForSmallDb(
-    JNIEnv*, jobject, jlong jhandle) {
+void Java_org_rocksdb_DBOptions_optimizeForSmallDb(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->OptimizeForSmallDb();
 }
@@ -5332,8 +5894,8 @@ void Java_org_rocksdb_DBOptions_optimizeForSmallDb(
  * Method:    setEnv
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setEnv(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -5343,8 +5905,9 @@ void Java_org_rocksdb_DBOptions_setEnv(
  * Method:    setIncreaseParallelism
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setIncreaseParallelism(
-    JNIEnv*, jobject, jlong jhandle, jint totalThreads) {
+void Java_org_rocksdb_DBOptions_setIncreaseParallelism(JNIEnv*, jobject,
+                                                       jlong jhandle,
+                                                       jint totalThreads) {
   reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->IncreaseParallelism(
       static_cast<int>(totalThreads));
 }
@@ -5354,8 +5917,9 @@ void Java_org_rocksdb_DBOptions_setIncreaseParallelism(
  * Method:    setCreateIfMissing
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setCreateIfMissing(
-    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+void Java_org_rocksdb_DBOptions_setCreateIfMissing(JNIEnv*, jobject,
+                                                   jlong jhandle,
+                                                   jboolean flag) {
   reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->create_if_missing =
       flag;
 }
@@ -5365,8 +5929,8 @@ void Java_org_rocksdb_DBOptions_setCreateIfMissing(
  * Method:    createIfMissing
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_createIfMissing(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_createIfMissing(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->create_if_missing;
 }
@@ -5376,8 +5940,9 @@ jboolean Java_org_rocksdb_DBOptions_createIfMissing(
  * Method:    setCreateMissingColumnFamilies
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setCreateMissingColumnFamilies(
-    JNIEnv*, jobject, jlong jhandle, jboolean flag) {
+void Java_org_rocksdb_DBOptions_setCreateMissingColumnFamilies(JNIEnv*, jobject,
+                                                               jlong jhandle,
+                                                               jboolean flag) {
   reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->create_missing_column_families = flag;
 }
@@ -5387,8 +5952,9 @@ void Java_org_rocksdb_DBOptions_setCreateMissingColumnFamilies(
  * Method:    createMissingColumnFamilies
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_createMissingColumnFamilies(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_createMissingColumnFamilies(JNIEnv*,
+                                                                jobject,
+                                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->create_missing_column_families;
 }
@@ -5398,8 +5964,9 @@ jboolean Java_org_rocksdb_DBOptions_createMissingColumnFamilies(
  * Method:    setErrorIfExists
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setErrorIfExists(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -5409,8 +5976,8 @@ void Java_org_rocksdb_DBOptions_setErrorIfExists(
  * Method:    errorIfExists
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_errorIfExists(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_errorIfExists(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->error_if_exists;
 }
@@ -5420,8 +5987,9 @@ jboolean Java_org_rocksdb_DBOptions_errorIfExists(
  * Method:    setParanoidChecks
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setParanoidChecks(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -5431,8 +5999,8 @@ void Java_org_rocksdb_DBOptions_setParanoidChecks(
  * Method:    paranoidChecks
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_paranoidChecks(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_paranoidChecks(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->paranoid_checks;
 }
@@ -5442,8 +6010,8 @@ jboolean Java_org_rocksdb_DBOptions_paranoidChecks(
  * Method:    setRateLimiter
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setRateLimiter(
-    JNIEnv*, jobject, jlong jhandle, jlong jrate_limiter_handle) {
+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);
@@ -5470,8 +6038,8 @@ void Java_org_rocksdb_DBOptions_setSstFileManager(
  * Method:    setLogger
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setLogger(
-    JNIEnv*, jobject, jlong jhandle, jlong jlogger_handle) {
+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);
@@ -5483,8 +6051,8 @@ void Java_org_rocksdb_DBOptions_setLogger(
  * Method:    setInfoLogLevel
  * Signature: (JB)V
  */
-void Java_org_rocksdb_DBOptions_setInfoLogLevel(
-    JNIEnv*, jobject, jlong jhandle, jbyte 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);
 }
@@ -5494,8 +6062,7 @@ void Java_org_rocksdb_DBOptions_setInfoLogLevel(
  * Method:    infoLogLevel
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_DBOptions_infoLogLevel(
-    JNIEnv*, jobject, jlong jhandle) {
+jbyte Java_org_rocksdb_DBOptions_infoLogLevel(JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jbyte>(
       reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->info_log_level);
 }
@@ -5505,8 +6072,9 @@ jbyte Java_org_rocksdb_DBOptions_infoLogLevel(
  * Method:    setMaxTotalWalSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setMaxTotalWalSize(
-    JNIEnv*, jobject, jlong jhandle, jlong jmax_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);
 }
@@ -5516,8 +6084,8 @@ void Java_org_rocksdb_DBOptions_setMaxTotalWalSize(
  * Method:    maxTotalWalSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_maxTotalWalSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_maxTotalWalSize(JNIEnv*, jobject,
+                                                 jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_total_wal_size;
 }
@@ -5527,8 +6095,8 @@ jlong Java_org_rocksdb_DBOptions_maxTotalWalSize(
  * Method:    setMaxOpenFiles
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxOpenFiles(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -5538,8 +6106,7 @@ void Java_org_rocksdb_DBOptions_setMaxOpenFiles(
  * Method:    maxOpenFiles
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxOpenFiles(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_maxOpenFiles(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_open_files;
 }
@@ -5560,8 +6127,8 @@ void Java_org_rocksdb_DBOptions_setMaxFileOpeningThreads(
  * Method:    maxFileOpeningThreads
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxFileOpeningThreads(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -5571,8 +6138,8 @@ jint Java_org_rocksdb_DBOptions_maxFileOpeningThreads(
  * Method:    setStatistics
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setStatistics(
-    JNIEnv*, jobject, jlong jhandle, jlong 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>*>(
@@ -5585,8 +6152,7 @@ void Java_org_rocksdb_DBOptions_setStatistics(
  * Method:    statistics
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_statistics(
-    JNIEnv*, jobject, jlong jhandle) {
+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) {
@@ -5594,7 +6160,7 @@ jlong Java_org_rocksdb_DBOptions_statistics(
   } else {
     std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>* pSptr =
         new std::shared_ptr<ROCKSDB_NAMESPACE::Statistics>(sptr);
-    return reinterpret_cast<jlong>(pSptr);
+    return GET_CPLUSPLUS_POINTER(pSptr);
   }
 }
 
@@ -5603,8 +6169,8 @@ jlong Java_org_rocksdb_DBOptions_statistics(
  * Method:    setUseFsync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setUseFsync(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -5614,8 +6180,7 @@ void Java_org_rocksdb_DBOptions_setUseFsync(
  * Method:    useFsync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_useFsync(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_useFsync(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)->use_fsync;
 }
 
@@ -5624,9 +6189,9 @@ jboolean Java_org_rocksdb_DBOptions_useFsync(
  * Method:    setDbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_DBOptions_setDbPaths(
-    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
-    jlongArray jtarget_sizes) {
+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) {
@@ -5670,8 +6235,7 @@ void Java_org_rocksdb_DBOptions_setDbPaths(
  * Method:    dbPathsLen
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_dbPathsLen(
-    JNIEnv*, jobject, jlong 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());
 }
@@ -5681,9 +6245,9 @@ jlong Java_org_rocksdb_DBOptions_dbPathsLen(
  * Method:    dbPaths
  * Signature: (J[Ljava/lang/String;[J)V
  */
-void Java_org_rocksdb_DBOptions_dbPaths(
-    JNIEnv* env, jobject, jlong jhandle, jobjectArray jpaths,
-    jlongArray jtarget_sizes) {
+void Java_org_rocksdb_DBOptions_dbPaths(JNIEnv* env, jobject, jlong jhandle,
+                                        jobjectArray jpaths,
+                                        jlongArray jtarget_sizes) {
   jboolean is_copy;
   jlong* ptr_jtarget_size = env->GetLongArrayElements(jtarget_sizes, &is_copy);
   if (ptr_jtarget_size == nullptr) {
@@ -5722,8 +6286,8 @@ void Java_org_rocksdb_DBOptions_dbPaths(
  * Method:    setDbLogDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_DBOptions_setDbLogDir(
-    JNIEnv* env, jobject, 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
@@ -5740,8 +6304,8 @@ void Java_org_rocksdb_DBOptions_setDbLogDir(
  * Method:    dbLogDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_DBOptions_dbLogDir(
-    JNIEnv* env, jobject, jlong jhandle) {
+jstring Java_org_rocksdb_DBOptions_dbLogDir(JNIEnv* env, jobject,
+                                            jlong jhandle) {
   return env->NewStringUTF(
       reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
           ->db_log_dir.c_str());
@@ -5752,8 +6316,8 @@ jstring Java_org_rocksdb_DBOptions_dbLogDir(
  * Method:    setWalDir
  * Signature: (JLjava/lang/String)V
  */
-void Java_org_rocksdb_DBOptions_setWalDir(
-    JNIEnv* env, jobject, 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_NAMESPACE::DBOptions*>(jhandle)->wal_dir.assign(
       wal_dir);
@@ -5765,8 +6329,7 @@ void Java_org_rocksdb_DBOptions_setWalDir(
  * Method:    walDir
  * Signature: (J)Ljava/lang/String
  */
-jstring Java_org_rocksdb_DBOptions_walDir(
-    JNIEnv* env, jobject, jlong jhandle) {
+jstring Java_org_rocksdb_DBOptions_walDir(JNIEnv* env, jobject, jlong jhandle) {
   return env->NewStringUTF(
       reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
           ->wal_dir.c_str());
@@ -5785,35 +6348,13 @@ void Java_org_rocksdb_DBOptions_setDeleteObsoleteFilesPeriodMicros(
 
 /*
  * Class:     org_rocksdb_DBOptions
- * Method:    deleteObsoleteFilesPeriodMicros
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_DBOptions_deleteObsoleteFilesPeriodMicros(
-    JNIEnv*, jobject, jlong jhandle) {
-  return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
-      ->delete_obsolete_files_period_micros;
-}
-
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    setBaseBackgroundCompactions
- * Signature: (JI)V
- */
-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);
-}
-
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    baseBackgroundCompactions
- * Signature: (J)I
+ * Method:    deleteObsoleteFilesPeriodMicros
+ * Signature: (J)J
  */
-jint Java_org_rocksdb_DBOptions_baseBackgroundCompactions(
+jlong Java_org_rocksdb_DBOptions_deleteObsoleteFilesPeriodMicros(
     JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
-      ->base_background_compactions;
+      ->delete_obsolete_files_period_micros;
 }
 
 /*
@@ -5821,8 +6362,9 @@ jint Java_org_rocksdb_DBOptions_baseBackgroundCompactions(
  * Method:    setMaxBackgroundCompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxBackgroundCompactions(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -5832,8 +6374,8 @@ void Java_org_rocksdb_DBOptions_setMaxBackgroundCompactions(
  * Method:    maxBackgroundCompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxBackgroundCompactions(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_maxBackgroundCompactions(JNIEnv*, jobject,
+                                                         jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_background_compactions;
 }
@@ -5843,8 +6385,8 @@ jint Java_org_rocksdb_DBOptions_maxBackgroundCompactions(
  * Method:    setMaxSubcompactions
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxSubcompactions(
-    JNIEnv*, jobject, jlong jhandle, jint max) {
+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);
 }
@@ -5854,8 +6396,8 @@ void Java_org_rocksdb_DBOptions_setMaxSubcompactions(
  * Method:    maxSubcompactions
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxSubcompactions(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_maxSubcompactions(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_subcompactions;
 }
@@ -5876,8 +6418,8 @@ void Java_org_rocksdb_DBOptions_setMaxBackgroundFlushes(
  * Method:    maxBackgroundFlushes
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxBackgroundFlushes(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_maxBackgroundFlushes(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_background_flushes;
 }
@@ -5887,8 +6429,9 @@ jint Java_org_rocksdb_DBOptions_maxBackgroundFlushes(
  * Method:    setMaxBackgroundJobs
  * Signature: (JI)V
  */
-void Java_org_rocksdb_DBOptions_setMaxBackgroundJobs(
-    JNIEnv*, jobject, jlong jhandle, jint 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);
 }
@@ -5898,8 +6441,8 @@ void Java_org_rocksdb_DBOptions_setMaxBackgroundJobs(
  * Method:    maxBackgroundJobs
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_maxBackgroundJobs(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_maxBackgroundJobs(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_background_jobs;
 }
@@ -5909,8 +6452,9 @@ jint Java_org_rocksdb_DBOptions_maxBackgroundJobs(
  * Method:    setMaxLogFileSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setMaxLogFileSize(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -5926,8 +6470,8 @@ void Java_org_rocksdb_DBOptions_setMaxLogFileSize(
  * Method:    maxLogFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_maxLogFileSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_maxLogFileSize(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_log_file_size;
 }
@@ -5954,8 +6498,8 @@ void Java_org_rocksdb_DBOptions_setLogFileTimeToRoll(
  * Method:    logFileTimeToRoll
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_logFileTimeToRoll(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_logFileTimeToRoll(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->log_file_time_to_roll;
 }
@@ -5965,8 +6509,9 @@ jlong Java_org_rocksdb_DBOptions_logFileTimeToRoll(
  * Method:    setKeepLogFileNum
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setKeepLogFileNum(
-    JNIEnv* env, jobject, jlong jhandle, jlong 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()) {
@@ -5982,8 +6527,8 @@ void Java_org_rocksdb_DBOptions_setKeepLogFileNum(
  * Method:    keepLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_keepLogFileNum(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_keepLogFileNum(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->keep_log_file_num;
 }
@@ -6010,8 +6555,8 @@ void Java_org_rocksdb_DBOptions_setRecycleLogFileNum(
  * Method:    recycleLogFileNum
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_recycleLogFileNum(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_recycleLogFileNum(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->recycle_log_file_num;
 }
@@ -6032,8 +6577,8 @@ void Java_org_rocksdb_DBOptions_setMaxManifestFileSize(
  * Method:    maxManifestFileSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_maxManifestFileSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_maxManifestFileSize(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->max_manifest_file_size;
 }
@@ -6054,8 +6599,8 @@ void Java_org_rocksdb_DBOptions_setTableCacheNumshardbits(
  * Method:    tableCacheNumshardbits
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->table_cache_numshardbits;
 }
@@ -6065,8 +6610,9 @@ jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(
  * Method:    setWalTtlSeconds
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalTtlSeconds(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -6076,8 +6622,8 @@ void Java_org_rocksdb_DBOptions_setWalTtlSeconds(
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_walTtlSeconds(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_walTtlSeconds(JNIEnv*, jobject,
+                                               jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->WAL_ttl_seconds;
 }
@@ -6087,8 +6633,9 @@ jlong Java_org_rocksdb_DBOptions_walTtlSeconds(
  * Method:    setWalSizeLimitMB
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalSizeLimitMB(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -6098,8 +6645,8 @@ void Java_org_rocksdb_DBOptions_setWalSizeLimitMB(
  * Method:    walTtlSeconds
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_walSizeLimitMB(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_walSizeLimitMB(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->WAL_size_limit_MB;
 }
@@ -6149,8 +6696,8 @@ void Java_org_rocksdb_DBOptions_setManifestPreallocationSize(
  * Method:    manifestPreallocationSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_manifestPreallocationSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_manifestPreallocationSize(JNIEnv*, jobject,
+                                                           jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->manifest_preallocation_size;
 }
@@ -6160,8 +6707,8 @@ jlong Java_org_rocksdb_DBOptions_manifestPreallocationSize(
  * Method:    useDirectReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_useDirectReads(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_useDirectReads(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->use_direct_reads;
 }
@@ -6171,8 +6718,9 @@ jboolean Java_org_rocksdb_DBOptions_useDirectReads(
  * Method:    setUseDirectReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setUseDirectReads(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -6206,8 +6754,9 @@ void Java_org_rocksdb_DBOptions_setUseDirectIoForFlushAndCompaction(
  * Method:    setAllowFAllocate
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllowFAllocate(
-    JNIEnv*, jobject, jlong jhandle, jboolean jallow_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);
 }
@@ -6217,8 +6766,8 @@ void Java_org_rocksdb_DBOptions_setAllowFAllocate(
  * Method:    allowFAllocate
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowFAllocate(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6228,8 +6777,9 @@ jboolean Java_org_rocksdb_DBOptions_allowFAllocate(
  * Method:    setAllowMmapReads
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllowMmapReads(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -6239,8 +6789,8 @@ void Java_org_rocksdb_DBOptions_setAllowMmapReads(
  * Method:    allowMmapReads
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowMmapReads(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_allowMmapReads(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->allow_mmap_reads;
 }
@@ -6250,8 +6800,9 @@ jboolean Java_org_rocksdb_DBOptions_allowMmapReads(
  * Method:    setAllowMmapWrites
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllowMmapWrites(
-    JNIEnv*, jobject, jlong jhandle, jboolean 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);
 }
@@ -6261,8 +6812,8 @@ void Java_org_rocksdb_DBOptions_setAllowMmapWrites(
  * Method:    allowMmapWrites
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowMmapWrites(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_allowMmapWrites(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->allow_mmap_writes;
 }
@@ -6283,8 +6834,8 @@ void Java_org_rocksdb_DBOptions_setIsFdCloseOnExec(
  * Method:    isFdCloseOnExec
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_isFdCloseOnExec(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_isFdCloseOnExec(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->is_fd_close_on_exec;
 }
@@ -6306,8 +6857,8 @@ void Java_org_rocksdb_DBOptions_setStatsDumpPeriodSec(
  * Method:    statsDumpPeriodSec
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_statsDumpPeriodSec(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_statsDumpPeriodSec(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->stats_dump_period_sec;
 }
@@ -6329,8 +6880,8 @@ void Java_org_rocksdb_DBOptions_setStatsPersistPeriodSec(
  * Method:    statsPersistPeriodSec
  * Signature: (J)I
  */
-jint Java_org_rocksdb_DBOptions_statsPersistPeriodSec(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_DBOptions_statsPersistPeriodSec(JNIEnv*, jobject,
+                                                      jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->stats_persist_period_sec;
 }
@@ -6352,8 +6903,8 @@ void Java_org_rocksdb_DBOptions_setStatsHistoryBufferSize(
  * Method:    statsHistoryBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_statsHistoryBufferSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_statsHistoryBufferSize(JNIEnv*, jobject,
+                                                        jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->stats_history_buffer_size;
 }
@@ -6374,8 +6925,8 @@ void Java_org_rocksdb_DBOptions_setAdviseRandomOnOpen(
  * Method:    adviseRandomOnOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_adviseRandomOnOpen(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_adviseRandomOnOpen(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->advise_random_on_open;
 }
@@ -6411,8 +6962,8 @@ void Java_org_rocksdb_DBOptions_setWriteBufferManager(
  * Method:    dbWriteBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_dbWriteBufferSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6434,37 +6985,13 @@ void Java_org_rocksdb_DBOptions_setAccessHintOnCompactionStart(
  * Method:    accessHintOnCompactionStart
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_DBOptions_accessHintOnCompactionStart(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
 
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    setNewTableReaderForCompactionInputs
- * Signature: (JZ)V
- */
-void Java_org_rocksdb_DBOptions_setNewTableReaderForCompactionInputs(
-    JNIEnv*, jobject, jlong jhandle,
-    jboolean jnew_table_reader_for_compaction_inputs) {
-  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
-  opt->new_table_reader_for_compaction_inputs =
-      static_cast<bool>(jnew_table_reader_for_compaction_inputs);
-}
-
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    newTableReaderForCompactionInputs
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_DBOptions_newTableReaderForCompactionInputs(
-    JNIEnv*, jobject, jlong jhandle) {
-  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle);
-  return static_cast<bool>(opt->new_table_reader_for_compaction_inputs);
-}
-
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setCompactionReadaheadSize
@@ -6482,8 +7009,8 @@ void Java_org_rocksdb_DBOptions_setCompactionReadaheadSize(
  * Method:    compactionReadaheadSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_compactionReadaheadSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6505,8 +7032,8 @@ void Java_org_rocksdb_DBOptions_setRandomAccessMaxBufferSize(
  * Method:    randomAccessMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_randomAccessMaxBufferSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6528,8 +7055,8 @@ void Java_org_rocksdb_DBOptions_setWritableFileMaxBufferSize(
  * Method:    writableFileMaxBufferSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_writableFileMaxBufferSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6550,8 +7077,8 @@ void Java_org_rocksdb_DBOptions_setUseAdaptiveMutex(
  * Method:    useAdaptiveMutex
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_useAdaptiveMutex(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_useAdaptiveMutex(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->use_adaptive_mutex;
 }
@@ -6561,8 +7088,8 @@ jboolean Java_org_rocksdb_DBOptions_useAdaptiveMutex(
  * Method:    setBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setBytesPerSync(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -6572,8 +7099,7 @@ void Java_org_rocksdb_DBOptions_setBytesPerSync(
  * Method:    bytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_bytesPerSync(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_bytesPerSync(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->bytes_per_sync;
 }
@@ -6583,8 +7109,9 @@ jlong Java_org_rocksdb_DBOptions_bytesPerSync(
  * Method:    setWalBytesPerSync
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalBytesPerSync(
-    JNIEnv*, jobject, jlong jhandle, jlong jwal_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);
 }
@@ -6594,8 +7121,8 @@ void Java_org_rocksdb_DBOptions_setWalBytesPerSync(
  * Method:    walBytesPerSync
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_walBytesPerSync(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6616,8 +7143,8 @@ void Java_org_rocksdb_DBOptions_setStrictBytesPerSync(
  * Method:    strictBytesPerSync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_strictBytesPerSync(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_DBOptions_strictBytesPerSync(JNIEnv*, jobject,
+                                                       jlong jhandle) {
   return static_cast<jboolean>(
       reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
           ->strict_bytes_per_sync);
@@ -6651,8 +7178,9 @@ jobjectArray Java_org_rocksdb_DBOptions_eventListeners(JNIEnv* env, jclass,
  * Method:    setDelayedWriteRate
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setDelayedWriteRate(
-    JNIEnv*, jobject, jlong jhandle, jlong jdelayed_write_rate) {
+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);
 }
@@ -6662,8 +7190,8 @@ void Java_org_rocksdb_DBOptions_setDelayedWriteRate(
  * Method:    delayedWriteRate
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_delayedWriteRate(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6684,8 +7212,8 @@ void Java_org_rocksdb_DBOptions_setEnablePipelinedWrite(
  * Method:    enablePipelinedWrite
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_enablePipelinedWrite(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -6695,8 +7223,9 @@ jboolean Java_org_rocksdb_DBOptions_enablePipelinedWrite(
  * Method:    setUnorderedWrite
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setUnorderedWrite(
-        JNIEnv*, jobject, jlong jhandle, jboolean junordered_write) {
+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;
 }
@@ -6706,13 +7235,12 @@ void Java_org_rocksdb_DBOptions_setUnorderedWrite(
  * Method:    unorderedWrite
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_unorderedWrite(
-        JNIEnv*, jobject, jlong jhandle) {
+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
@@ -6729,8 +7257,8 @@ void Java_org_rocksdb_DBOptions_setEnableThreadTracking(
  * Method:    enableThreadTracking
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_enableThreadTracking(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -6784,8 +7312,9 @@ jboolean Java_org_rocksdb_DBOptions_enableWriteThreadAdaptiveYield(
  * Method:    setWriteThreadMaxYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWriteThreadMaxYieldUsec(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -6795,8 +7324,8 @@ void Java_org_rocksdb_DBOptions_setWriteThreadMaxYieldUsec(
  * Method:    writeThreadMaxYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_writeThreadMaxYieldUsec(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_writeThreadMaxYieldUsec(JNIEnv*, jobject,
+                                                         jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->write_thread_max_yield_usec;
 }
@@ -6806,8 +7335,9 @@ jlong Java_org_rocksdb_DBOptions_writeThreadMaxYieldUsec(
  * Method:    setWriteThreadSlowYieldUsec
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWriteThreadSlowYieldUsec(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -6817,8 +7347,8 @@ void Java_org_rocksdb_DBOptions_setWriteThreadSlowYieldUsec(
  * Method:    writeThreadSlowYieldUsec
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_DBOptions_writeThreadSlowYieldUsec(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_DBOptions_writeThreadSlowYieldUsec(JNIEnv*, jobject,
+                                                          jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jhandle)
       ->write_thread_slow_yield_usec;
 }
@@ -6840,8 +7370,8 @@ void Java_org_rocksdb_DBOptions_setSkipStatsUpdateOnDbOpen(
  * Method:    skipStatsUpdateOnDbOpen
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_skipStatsUpdateOnDbOpen(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6888,8 +7418,8 @@ void Java_org_rocksdb_DBOptions_setWalRecoveryMode(
  * Method:    walRecoveryMode
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_DBOptions_walRecoveryMode(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -6900,8 +7430,8 @@ jbyte Java_org_rocksdb_DBOptions_walRecoveryMode(
  * Method:    setAllow2pc
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAllow2pc(
-    JNIEnv*, jobject, jlong jhandle, jboolean jallow_2pc) {
+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);
 }
@@ -6911,8 +7441,7 @@ void Java_org_rocksdb_DBOptions_setAllow2pc(
  * Method:    allow2pc
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allow2pc(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6922,8 +7451,8 @@ jboolean Java_org_rocksdb_DBOptions_allow2pc(
  * Method:    setRowCache
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setRowCache(
-    JNIEnv*, jobject, jlong jhandle, jlong jrow_cache_handle) {
+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_NAMESPACE::Cache>*>(
@@ -6936,8 +7465,8 @@ void Java_org_rocksdb_DBOptions_setRowCache(
  * Method:    setWalFilter
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_DBOptions_setWalFilter(
-    JNIEnv*, jobject, jlong jhandle, jlong jwal_filter_handle) {
+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);
@@ -6961,8 +7490,8 @@ void Java_org_rocksdb_DBOptions_setFailIfOptionsFileError(
  * Method:    failIfOptionsFileError
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_failIfOptionsFileError(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -6983,8 +7512,8 @@ void Java_org_rocksdb_DBOptions_setDumpMallocStats(
  * Method:    dumpMallocStats
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_dumpMallocStats(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -7006,8 +7535,8 @@ void Java_org_rocksdb_DBOptions_setAvoidFlushDuringRecovery(
  * Method:    avoidFlushDuringRecovery
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_avoidFlushDuringRecovery(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -7028,41 +7557,20 @@ void Java_org_rocksdb_DBOptions_setAllowIngestBehind(
  * Method:    allowIngestBehind
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_allowIngestBehind(
-    JNIEnv*, jobject, jlong jhandle) {
+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) {
+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;
 }
@@ -7072,8 +7580,8 @@ void Java_org_rocksdb_DBOptions_setTwoWriteQueues(
  * Method:    twoWriteQueues
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_twoWriteQueues(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -7083,8 +7591,9 @@ jboolean Java_org_rocksdb_DBOptions_twoWriteQueues(
  * Method:    setManualWalFlush
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setManualWalFlush(
-    JNIEnv*, jobject, jlong jhandle, jboolean jmanual_wal_flush) {
+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;
 }
@@ -7094,8 +7603,8 @@ void Java_org_rocksdb_DBOptions_setManualWalFlush(
  * Method:    manualWalFlush
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_manualWalFlush(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -7105,8 +7614,8 @@ jboolean Java_org_rocksdb_DBOptions_manualWalFlush(
  * Method:    setAtomicFlush
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_DBOptions_setAtomicFlush(
-    JNIEnv*, jobject, jlong jhandle, jboolean jatomic_flush) {
+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;
 }
@@ -7116,8 +7625,8 @@ void Java_org_rocksdb_DBOptions_setAtomicFlush(
  * Method:    atomicFlush
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_atomicFlush(
-    JNIEnv *, jobject, jlong jhandle) {
+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);
 }
@@ -7139,8 +7648,8 @@ void Java_org_rocksdb_DBOptions_setAvoidFlushDuringShutdown(
  * Method:    avoidFlushDuringShutdown
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_DBOptions_avoidFlushDuringShutdown(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -7309,10 +7818,9 @@ jlong Java_org_rocksdb_DBOptions_bgerrorResumeRetryInterval(JNIEnv*, jclass,
  * Method:    newWriteOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_WriteOptions_newWriteOptions(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_WriteOptions_newWriteOptions(JNIEnv*, jclass) {
   auto* op = new ROCKSDB_NAMESPACE::WriteOptions();
-  return reinterpret_cast<jlong>(op);
+  return GET_CPLUSPLUS_POINTER(op);
 }
 
 /*
@@ -7320,11 +7828,11 @@ jlong Java_org_rocksdb_WriteOptions_newWriteOptions(
  * Method:    copyWriteOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_WriteOptions_copyWriteOptions(
-    JNIEnv*, jclass, jlong 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);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -7332,8 +7840,8 @@ jlong Java_org_rocksdb_WriteOptions_copyWriteOptions(
  * Method:    disposeInternal
  * Signature: ()V
  */
-void Java_org_rocksdb_WriteOptions_disposeInternal(
-    JNIEnv*, jobject, jlong jhandle) {
+void Java_org_rocksdb_WriteOptions_disposeInternal(JNIEnv*, jobject,
+                                                   jlong jhandle) {
   auto* write_options =
       reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle);
   assert(write_options != nullptr);
@@ -7345,8 +7853,8 @@ void Java_org_rocksdb_WriteOptions_disposeInternal(
  * Method:    setSync
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setSync(
-    JNIEnv*, jobject, jlong jhandle, jboolean jflag) {
+void Java_org_rocksdb_WriteOptions_setSync(JNIEnv*, jobject, jlong jhandle,
+                                           jboolean jflag) {
   reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->sync = jflag;
 }
 
@@ -7355,8 +7863,7 @@ void Java_org_rocksdb_WriteOptions_setSync(
  * Method:    sync
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_sync(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_WriteOptions_sync(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->sync;
 }
 
@@ -7365,8 +7872,9 @@ jboolean Java_org_rocksdb_WriteOptions_sync(
  * Method:    setDisableWAL
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setDisableWAL(
-    JNIEnv*, jobject, jlong jhandle, jboolean jflag) {
+void Java_org_rocksdb_WriteOptions_setDisableWAL(JNIEnv*, jobject,
+                                                 jlong jhandle,
+                                                 jboolean jflag) {
   reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->disableWAL =
       jflag;
 }
@@ -7376,8 +7884,8 @@ void Java_org_rocksdb_WriteOptions_setDisableWAL(
  * Method:    disableWAL
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_disableWAL(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_WriteOptions_disableWAL(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
       ->disableWAL;
 }
@@ -7388,8 +7896,7 @@ jboolean Java_org_rocksdb_WriteOptions_disableWAL(
  * Signature: (JZ)V
  */
 void Java_org_rocksdb_WriteOptions_setIgnoreMissingColumnFamilies(
-    JNIEnv*, jobject, jlong jhandle,
-    jboolean jignore_missing_column_families) {
+    JNIEnv*, jobject, jlong jhandle, jboolean jignore_missing_column_families) {
   reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
       ->ignore_missing_column_families =
       static_cast<bool>(jignore_missing_column_families);
@@ -7411,8 +7918,9 @@ jboolean Java_org_rocksdb_WriteOptions_ignoreMissingColumnFamilies(
  * Method:    setNoSlowdown
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setNoSlowdown(
-    JNIEnv*, jobject, jlong jhandle, jboolean jno_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);
 }
@@ -7422,8 +7930,8 @@ void Java_org_rocksdb_WriteOptions_setNoSlowdown(
  * Method:    noSlowdown
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_noSlowdown(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_WriteOptions_noSlowdown(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
       ->no_slowdown;
 }
@@ -7433,8 +7941,8 @@ jboolean Java_org_rocksdb_WriteOptions_noSlowdown(
  * Method:    setLowPri
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_WriteOptions_setLowPri(
-    JNIEnv*, jobject, jlong jhandle, jboolean jlow_pri) {
+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);
 }
@@ -7444,11 +7952,33 @@ void Java_org_rocksdb_WriteOptions_setLowPri(
  * Method:    lowPri
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_WriteOptions_lowPri(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_WriteOptions_lowPri(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)->low_pri;
 }
 
+/*
+ * Class:     org_rocksdb_WriteOptions
+ * Method:    memtableInsertHintPerBatch
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_WriteOptions_memtableInsertHintPerBatch(
+    JNIEnv*, jobject, jlong jhandle) {
+  return reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
+      ->memtable_insert_hint_per_batch;
+}
+
+/*
+ * Class:     org_rocksdb_WriteOptions
+ * Method:    setMemtableInsertHintPerBatch
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_WriteOptions_setMemtableInsertHintPerBatch(
+    JNIEnv*, jobject, jlong jhandle, jboolean jmemtable_insert_hint_per_batch) {
+  reinterpret_cast<ROCKSDB_NAMESPACE::WriteOptions*>(jhandle)
+      ->memtable_insert_hint_per_batch =
+      static_cast<bool>(jmemtable_insert_hint_per_batch);
+}
+
 /////////////////////////////////////////////////////////////////////
 // ROCKSDB_NAMESPACE::ReadOptions
 
@@ -7457,10 +7987,9 @@ jboolean Java_org_rocksdb_WriteOptions_lowPri(
  * Method:    newReadOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_ReadOptions_newReadOptions__(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_ReadOptions_newReadOptions__(JNIEnv*, jclass) {
   auto* read_options = new ROCKSDB_NAMESPACE::ReadOptions();
-  return reinterpret_cast<jlong>(read_options);
+  return GET_CPLUSPLUS_POINTER(read_options);
 }
 
 /*
@@ -7472,7 +8001,7 @@ 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);
+  return GET_CPLUSPLUS_POINTER(read_options);
 }
 
 /*
@@ -7480,11 +8009,11 @@ jlong Java_org_rocksdb_ReadOptions_newReadOptions__ZZ(
  * Method:    copyReadOptions
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_copyReadOptions(
-    JNIEnv*, jclass, jlong 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);
+  return GET_CPLUSPLUS_POINTER(new_opt);
 }
 
 /*
@@ -7492,8 +8021,8 @@ jlong Java_org_rocksdb_ReadOptions_copyReadOptions(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_ReadOptions_disposeInternal(
-    JNIEnv*, jobject, jlong jhandle) {
+void Java_org_rocksdb_ReadOptions_disposeInternal(JNIEnv*, jobject,
+                                                  jlong jhandle) {
   auto* read_options =
       reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
   assert(read_options != nullptr);
@@ -7516,8 +8045,8 @@ void Java_org_rocksdb_ReadOptions_setVerifyChecksums(
  * Method:    verifyChecksums
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_verifyChecksums(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_verifyChecksums(JNIEnv*, jobject,
+                                                      jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
       ->verify_checksums;
 }
@@ -7527,8 +8056,8 @@ jboolean Java_org_rocksdb_ReadOptions_verifyChecksums(
  * Method:    setFillCache
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setFillCache(
-    JNIEnv*, jobject, jlong jhandle, jboolean jfill_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);
 }
@@ -7538,8 +8067,8 @@ void Java_org_rocksdb_ReadOptions_setFillCache(
  * Method:    fillCache
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_fillCache(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_fillCache(JNIEnv*, jobject,
+                                                jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->fill_cache;
 }
 
@@ -7548,8 +8077,8 @@ jboolean Java_org_rocksdb_ReadOptions_fillCache(
  * Method:    setTailing
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setTailing(
-    JNIEnv*, jobject, jlong jhandle, jboolean jtailing) {
+void Java_org_rocksdb_ReadOptions_setTailing(JNIEnv*, jobject, jlong jhandle,
+                                             jboolean jtailing) {
   reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->tailing =
       static_cast<bool>(jtailing);
 }
@@ -7559,8 +8088,7 @@ void Java_org_rocksdb_ReadOptions_setTailing(
  * Method:    tailing
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_tailing(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_tailing(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->tailing;
 }
 
@@ -7569,8 +8097,7 @@ jboolean Java_org_rocksdb_ReadOptions_tailing(
  * Method:    managed
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_managed(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_managed(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->managed;
 }
 
@@ -7579,8 +8106,8 @@ jboolean Java_org_rocksdb_ReadOptions_managed(
  * Method:    setManaged
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setManaged(
-    JNIEnv*, jobject, jlong jhandle, jboolean jmanaged) {
+void Java_org_rocksdb_ReadOptions_setManaged(JNIEnv*, jobject, jlong jhandle,
+                                             jboolean jmanaged) {
   reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->managed =
       static_cast<bool>(jmanaged);
 }
@@ -7590,8 +8117,8 @@ void Java_org_rocksdb_ReadOptions_setManaged(
  * Method:    totalOrderSeek
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_totalOrderSeek(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_totalOrderSeek(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
       ->total_order_seek;
 }
@@ -7612,8 +8139,8 @@ void Java_org_rocksdb_ReadOptions_setTotalOrderSeek(
  * Method:    prefixSameAsStart
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_prefixSameAsStart(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_prefixSameAsStart(JNIEnv*, jobject,
+                                                        jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
       ->prefix_same_as_start;
 }
@@ -7634,8 +8161,7 @@ void Java_org_rocksdb_ReadOptions_setPrefixSameAsStart(
  * Method:    pinData
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_pinData(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ReadOptions_pinData(JNIEnv*, jobject, jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->pin_data;
 }
 
@@ -7644,8 +8170,8 @@ jboolean Java_org_rocksdb_ReadOptions_pinData(
  * Method:    setPinData
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_ReadOptions_setPinData(
-    JNIEnv*, jobject, jlong jhandle, jboolean jpin_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);
 }
@@ -7679,8 +8205,8 @@ void Java_org_rocksdb_ReadOptions_setBackgroundPurgeOnIteratorCleanup(
  * Method:    readaheadSize
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_readaheadSize(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -7690,8 +8216,9 @@ jlong Java_org_rocksdb_ReadOptions_readaheadSize(
  * Method:    setReadaheadSize
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_ReadOptions_setReadaheadSize(
-    JNIEnv*, jobject, jlong jhandle, jlong jreadahead_size) {
+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);
 }
@@ -7701,8 +8228,8 @@ void Java_org_rocksdb_ReadOptions_setReadaheadSize(
  * Method:    maxSkippableInternalKeys
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_maxSkippableInternalKeys(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
 }
@@ -7724,8 +8251,8 @@ void Java_org_rocksdb_ReadOptions_setMaxSkippableInternalKeys(
  * Method:    ignoreRangeDeletions
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ReadOptions_ignoreRangeDeletions(
-    JNIEnv*, jobject, jlong 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);
 }
@@ -7746,8 +8273,8 @@ void Java_org_rocksdb_ReadOptions_setIgnoreRangeDeletions(
  * Method:    setSnapshot
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_ReadOptions_setSnapshot(
-    JNIEnv*, jobject, jlong jhandle, jlong 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);
 }
@@ -7757,11 +8284,10 @@ void Java_org_rocksdb_ReadOptions_setSnapshot(
  * Method:    snapshot
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_snapshot(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ReadOptions_snapshot(JNIEnv*, jobject, jlong jhandle) {
   auto& snapshot =
       reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->snapshot;
-  return reinterpret_cast<jlong>(snapshot);
+  return GET_CPLUSPLUS_POINTER(snapshot);
 }
 
 /*
@@ -7769,8 +8295,7 @@ jlong Java_org_rocksdb_ReadOptions_snapshot(
  * Method:    readTier
  * Signature: (J)B
  */
-jbyte Java_org_rocksdb_ReadOptions_readTier(
-    JNIEnv*, jobject, jlong jhandle) {
+jbyte Java_org_rocksdb_ReadOptions_readTier(JNIEnv*, jobject, jlong jhandle) {
   return static_cast<jbyte>(
       reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)->read_tier);
 }
@@ -7780,8 +8305,8 @@ jbyte Java_org_rocksdb_ReadOptions_readTier(
  * Method:    setReadTier
  * Signature: (JB)V
  */
-void Java_org_rocksdb_ReadOptions_setReadTier(
-    JNIEnv*, jobject, jlong jhandle, jbyte 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);
 }
@@ -7803,12 +8328,12 @@ void Java_org_rocksdb_ReadOptions_setIterateUpperBound(
  * Method:    iterateUpperBound
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_iterateUpperBound(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ReadOptions_iterateUpperBound(JNIEnv*, jobject,
+                                                     jlong jhandle) {
   auto& upper_bound_slice_handle =
       reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle)
           ->iterate_upper_bound;
-  return reinterpret_cast<jlong>(upper_bound_slice_handle);
+  return GET_CPLUSPLUS_POINTER(upper_bound_slice_handle);
 }
 
 /*
@@ -7828,12 +8353,12 @@ void Java_org_rocksdb_ReadOptions_setIterateLowerBound(
  * Method:    iterateLowerBound
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_iterateLowerBound(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
+  return GET_CPLUSPLUS_POINTER(lower_bound_slice_handle);
 }
 
 /*
@@ -7852,24 +8377,137 @@ void Java_org_rocksdb_ReadOptions_setTableFilter(
 
 /*
  * Class:     org_rocksdb_ReadOptions
- * Method:    setIterStartSeqnum
+ * Method:    autoPrefixMode
+ * Signature: (J)Z
+ */
+jboolean Java_org_rocksdb_ReadOptions_autoPrefixMode(JNIEnv*, jobject,
+                                                     jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  return static_cast<jboolean>(opt->auto_prefix_mode);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setAutoPrefixMode
+ * Signature: (JZ)V
+ */
+void Java_org_rocksdb_ReadOptions_setAutoPrefixMode(
+    JNIEnv*, jobject, jlong jhandle, jboolean jauto_prefix_mode) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  opt->auto_prefix_mode = static_cast<bool>(jauto_prefix_mode);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    timestamp
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_timestamp(JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  auto& timestamp_slice_handle = opt->timestamp;
+  return reinterpret_cast<jlong>(timestamp_slice_handle);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setTimestamp
  * Signature: (JJ)V
  */
-void Java_org_rocksdb_ReadOptions_setIterStartSeqnum(
-    JNIEnv*, jobject, jlong jhandle, jlong jiter_start_seqnum) {
+void Java_org_rocksdb_ReadOptions_setTimestamp(JNIEnv*, jobject, jlong jhandle,
+                                               jlong jtimestamp_slice_handle) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
-  opt->iter_start_seqnum = static_cast<uint64_t>(jiter_start_seqnum);
+  opt->timestamp =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Slice*>(jtimestamp_slice_handle);
 }
 
 /*
  * Class:     org_rocksdb_ReadOptions
- * Method:    iterStartSeqnum
+ * Method:    iterStartTs
  * Signature: (J)J
  */
-jlong Java_org_rocksdb_ReadOptions_iterStartSeqnum(
-    JNIEnv*, jobject, jlong jhandle) {
+jlong Java_org_rocksdb_ReadOptions_iterStartTs(JNIEnv*, jobject,
+                                               jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  auto& iter_start_ts_handle = opt->iter_start_ts;
+  return reinterpret_cast<jlong>(iter_start_ts_handle);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setIterStartTs
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setIterStartTs(JNIEnv*, jobject,
+                                                 jlong jhandle,
+                                                 jlong jiter_start_ts_handle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  opt->iter_start_ts =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Slice*>(jiter_start_ts_handle);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    deadline
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_deadline(JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  return static_cast<jlong>(opt->deadline.count());
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setDeadline
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setDeadline(JNIEnv*, jobject, jlong jhandle,
+                                              jlong jdeadline) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  opt->deadline = std::chrono::microseconds(static_cast<int64_t>(jdeadline));
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    ioTimeout
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_ioTimeout(JNIEnv*, jobject, jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  return static_cast<jlong>(opt->io_timeout.count());
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setIoTimeout
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setIoTimeout(JNIEnv*, jobject, jlong jhandle,
+                                               jlong jio_timeout) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  opt->io_timeout =
+      std::chrono::microseconds(static_cast<int64_t>(jio_timeout));
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    valueSizeSofLimit
+ * Signature: (J)J
+ */
+jlong Java_org_rocksdb_ReadOptions_valueSizeSoftLimit(JNIEnv*, jobject,
+                                                      jlong jhandle) {
+  auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
+  return static_cast<jlong>(opt->value_size_soft_limit);
+}
+
+/*
+ * Class:     org_rocksdb_ReadOptions
+ * Method:    setValueSizeSofLimit
+ * Signature: (JJ)V
+ */
+void Java_org_rocksdb_ReadOptions_setValueSizeSoftLimit(
+    JNIEnv*, jobject, jlong jhandle, jlong jvalue_size_soft_limit) {
   auto* opt = reinterpret_cast<ROCKSDB_NAMESPACE::ReadOptions*>(jhandle);
-  return static_cast<jlong>(opt->iter_start_seqnum);
+  opt->value_size_soft_limit = static_cast<uint64_t>(jvalue_size_soft_limit);
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -7880,10 +8518,9 @@ jlong Java_org_rocksdb_ReadOptions_iterStartSeqnum(
  * Method:    newComparatorOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_ComparatorOptions_newComparatorOptions(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_ComparatorOptions_newComparatorOptions(JNIEnv*, jclass) {
   auto* comparator_opt = new ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions();
-  return reinterpret_cast<jlong>(comparator_opt);
+  return GET_CPLUSPLUS_POINTER(comparator_opt);
 }
 
 /*
@@ -7892,7 +8529,7 @@ jlong Java_org_rocksdb_ComparatorOptions_newComparatorOptions(
  * Signature: (J)B
  */
 jbyte Java_org_rocksdb_ComparatorOptions_reusedSynchronisationType(
-    JNIEnv *, jobject, jlong jhandle) {
+    JNIEnv*, jobject, jlong jhandle) {
   auto* comparator_opt =
       reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
           jhandle);
@@ -7921,8 +8558,8 @@ void Java_org_rocksdb_ComparatorOptions_setReusedSynchronisationType(
  * Method:    useDirectBuffer
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_ComparatorOptions_useDirectBuffer(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_ComparatorOptions_useDirectBuffer(JNIEnv*, jobject,
+                                                            jlong jhandle) {
   return static_cast<jboolean>(
       reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
           jhandle)
@@ -7945,8 +8582,8 @@ void Java_org_rocksdb_ComparatorOptions_setUseDirectBuffer(
  * Method:    maxReusedBufferSize
  * Signature: (J)I
  */
-jint Java_org_rocksdb_ComparatorOptions_maxReusedBufferSize(
-    JNIEnv*, jobject, jlong jhandle) {
+jint Java_org_rocksdb_ComparatorOptions_maxReusedBufferSize(JNIEnv*, jobject,
+                                                            jlong jhandle) {
   return static_cast<jint>(
       reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
           jhandle)
@@ -7969,8 +8606,8 @@ void Java_org_rocksdb_ComparatorOptions_setMaxReusedBufferSize(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_ComparatorOptions_disposeInternal(
-    JNIEnv*, jobject, jlong jhandle) {
+void Java_org_rocksdb_ComparatorOptions_disposeInternal(JNIEnv*, jobject,
+                                                        jlong jhandle) {
   auto* comparator_opt =
       reinterpret_cast<ROCKSDB_NAMESPACE::ComparatorJniCallbackOptions*>(
           jhandle);
@@ -7986,10 +8623,9 @@ void Java_org_rocksdb_ComparatorOptions_disposeInternal(
  * Method:    newFlushOptions
  * Signature: ()J
  */
-jlong Java_org_rocksdb_FlushOptions_newFlushOptions(
-    JNIEnv*, jclass) {
+jlong Java_org_rocksdb_FlushOptions_newFlushOptions(JNIEnv*, jclass) {
   auto* flush_opt = new ROCKSDB_NAMESPACE::FlushOptions();
-  return reinterpret_cast<jlong>(flush_opt);
+  return GET_CPLUSPLUS_POINTER(flush_opt);
 }
 
 /*
@@ -7997,8 +8633,9 @@ jlong Java_org_rocksdb_FlushOptions_newFlushOptions(
  * Method:    setWaitForFlush
  * Signature: (JZ)V
  */
-void Java_org_rocksdb_FlushOptions_setWaitForFlush(
-    JNIEnv*, jobject, jlong jhandle, jboolean jwait) {
+void Java_org_rocksdb_FlushOptions_setWaitForFlush(JNIEnv*, jobject,
+                                                   jlong jhandle,
+                                                   jboolean jwait) {
   reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle)->wait =
       static_cast<bool>(jwait);
 }
@@ -8008,8 +8645,8 @@ void Java_org_rocksdb_FlushOptions_setWaitForFlush(
  * Method:    waitForFlush
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_FlushOptions_waitForFlush(
-    JNIEnv*, jobject, jlong jhandle) {
+jboolean Java_org_rocksdb_FlushOptions_waitForFlush(JNIEnv*, jobject,
+                                                    jlong jhandle) {
   return reinterpret_cast<ROCKSDB_NAMESPACE::FlushOptions*>(jhandle)->wait;
 }
 
@@ -8030,8 +8667,8 @@ void Java_org_rocksdb_FlushOptions_setAllowWriteStall(
  * Method:    allowWriteStall
  * Signature: (J)Z
  */
-jboolean Java_org_rocksdb_FlushOptions_allowWriteStall(
-    JNIEnv*, jobject, jlong jhandle) {
+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);
@@ -8042,8 +8679,8 @@ jboolean Java_org_rocksdb_FlushOptions_allowWriteStall(
  * Method:    disposeInternal
  * Signature: (J)V
  */
-void Java_org_rocksdb_FlushOptions_disposeInternal(
-    JNIEnv*, jobject, jlong 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;