Fix GitHub issue #3716: gcc-8 warnings

Summary:
Fix the following gcc-8 warnings:
- conflicting C language linkage declaration [-Werror]
- writing to an object with no trivial copy-assignment [-Werror=class-memaccess]
- array subscript -1 is below array bounds [-Werror=array-bounds]

Solves https://github.com/facebook/rocksdb/issues/3716
Closes https://github.com/facebook/rocksdb/pull/3736

Differential Revision: D7684161

Pulled By: yiwu-arbug

fbshipit-source-id: 47c0423d26b74add251f1d3595211eee1e41e54a

CMakeLists.txt

@@ -14,7 +14,7 @@
 #        cd build
 # 3. Run cmake to generate project files for Windows, add more options to enable required third-party libraries.
 #    See thirdparty.inc for more information.
-#        sample command: cmake -G "Visual Studio 15 Win64" -DWITH_GFLAGS=1 -DWITH_SNAPPY=1 -DWITH_JEMALLOC=1 -DWITH_JNI=1 ..
+#        sample command: cmake -G "Visual Studio 14 Win64" -DGFLAGS=1 -DSNAPPY=1 -DJEMALLOC=1 -DJNI=1 ..
 # 4. Then build the project in debug mode (you may want to add /m[:<N>] flag to run msbuild in <N> parallel threads
 #                                          or simply /m ot use all avail cores)
 #        msbuild rocksdb.sln
@@ -42,14 +42,7 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
 
 option(WITH_JEMALLOC "build with JeMalloc" OFF)
-option(WITH_SNAPPY "build with SNAPPY" OFF)
-option(WITH_LZ4 "build with lz4" OFF)
-option(WITH_ZLIB "build with zlib" OFF)
 if(MSVC)
-  # Defaults currently different for GFLAGS.
-  #  We will address find_package work a little later
-  option(WITH_GFLAGS "build with GFlags" OFF)
-  option(WITH_XPRESS "build with windows built in compression" OFF)
   include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
 else()
   if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
@@ -63,18 +56,8 @@ else()
       include_directories(${JEMALLOC_INCLUDE_DIR})
     endif()
   endif()
-  
-  # No config file for this
-  option(WITH_GFLAGS "build with GFlags" ON)
-  if(WITH_GFLAGS)
-    find_package(gflags)
-    if(gflags_FOUND)
-      add_definitions(-DGFLAGS=1)
-      include_directories(${gflags_INCLUDE_DIR})
-      list(APPEND THIRDPARTY_LIBS ${gflags_LIBRARIES})
-    endif()
-  endif()
 
+  option(WITH_SNAPPY "build with SNAPPY" OFF)
   if(WITH_SNAPPY)
     find_package(snappy REQUIRED)
     add_definitions(-DSNAPPY)
@@ -82,6 +65,7 @@ else()
     list(APPEND THIRDPARTY_LIBS ${SNAPPY_LIBRARIES})
   endif()
 
+  option(WITH_ZLIB "build with zlib" OFF)
   if(WITH_ZLIB)
     find_package(zlib REQUIRED)
     add_definitions(-DZLIB)
@@ -97,6 +81,7 @@ else()
     list(APPEND THIRDPARTY_LIBS ${BZIP2_LIBRARIES})
   endif()
 
+  option(WITH_LZ4 "build with lz4" OFF)
   if(WITH_LZ4)
     find_package(lz4 REQUIRED)
     add_definitions(-DLZ4)
@@ -269,6 +254,13 @@ if(WITH_UBSAN)
   endif()
 endif()
 
+find_package(gflags)
+if(gflags_FOUND)
+  add_definitions(-DGFLAGS=1)
+  include_directories(${gflags_INCLUDE_DIR})
+  list(APPEND THIRDPARTY_LIBS ${gflags_LIBRARIES})
+endif()
+
 find_package(NUMA)
 if(NUMA_FOUND)
   add_definitions(-DNUMA)
@@ -498,7 +490,6 @@ set(SOURCES
         table/block_based_table_factory.cc
         table/block_based_table_reader.cc
         table/block_builder.cc
-        table/block_fetcher.cc
         table/block_prefix_index.cc
         table/bloom_block.cc
         table/cuckoo_table_builder.cc
@@ -586,7 +577,6 @@ set(SOURCES
         utilities/leveldb_options/leveldb_options.cc
         utilities/lua/rocks_lua_compaction_filter.cc
         utilities/memory/memory_util.cc
-        utilities/merge_operators/bytesxor.cc
         utilities/merge_operators/max.cc
         utilities/merge_operators/put.cc
         utilities/merge_operators/string_append/stringappend.cc

HISTORY.md

@@ -1,31 +1,23 @@
 # Rocksdb Change Log
-## 5.11.4 (03/16/2018)
-### Bug Fixes
+## 5.10.5 (03/16/2018)
+### Bug fixes
 * Fix WAL corruption caused by race condition between user write thread and backup/checkpoint thread.
 
-## 5.11.2 (02/24/2018)
-### Bug Fixes
-* Fix bug in iterator readahead causing blocks to incorrectly be considered truncated (corrupted).
-
-## 5.11.1 (02/22/2018)
+## 5.10.4 (02/22/2018)
 ### New Features
 * Follow rsync-style naming convention for BackupEngine tempfiles. This enables some optimizations when run on GlusterFS.
+* Fix regression of Java build break on Windows.
 
-## 5.11.0 (01/08/2018)
-### Public API Change
-* Add `autoTune` and `getBytesPerSecond()` to RocksJava RateLimiter
+## 5.10.3 (02/21/2018)
+### Bug fixes
+* Fix build break regression using gcc-7
+* Direct I/O writable file should do fsync in Close()
 
 ### New Features
-* Add a new histogram stat called rocksdb.db.flush.micros for memtable flush.
-* Add "--use_txn" option to use transactional API in db_stress.
-* Disable onboard cache for compaction output in Windows platform.
-* Improve the performance of iterators doing long range scans by using readahead.
+* Add rocksdb.iterator.internal-key property
 
+## 5.10.1 (01/18/2018)
 ### Bug Fixes
-* Fix a stack-use-after-scope bug in ForwardIterator.
-* Fix builds on platforms including Linux, Windows, and PowerPC.
-* Fix buffer overrun in backup engine for DBs with huge number of files.
-* Fix a mislabel bug for bottom-pri compaction threads.
 * Fix DB::Flush() keep waiting after flush finish under certain condition.
 
 ## 5.10.0 (12/11/2017)
@@ -33,11 +25,10 @@
 * When running `make` with environment variable `USE_SSE` set and `PORTABLE` unset, will use all machine features available locally. Previously this combination only compiled SSE-related features.
 
 ### New Features
+* CRC32C is now using the 3-way pipelined SSE algorithm `crc32c_3way` on supported platforms to improve performance. The system will choose to use this algorithm on supported platforms automatically whenever possible. If PCLMULQDQ is not supported it will fall back to the old Fast_CRC32 algorithm.
 * Provide lifetime hints when writing files on Linux. This reduces hardware write-amp on storage devices supporting multiple streams.
 * Add a DB stat, `NUMBER_ITER_SKIP`, which returns how many internal keys were skipped during iterations (e.g., due to being tombstones or duplicate versions of a key).
 * Add PerfContext counters, `key_lock_wait_count` and `key_lock_wait_time`, which measure the number of times transactions wait on key locks and total amount of time waiting.
-* Support dynamically changing `ColumnFamilyOptions::compaction_options_universal`.
-* Batch update stats at the end of each `Get`, rather than for each block cache access.
 
 ### Bug Fixes
 * Fix IOError on WAL write doesn't propagate to write group follower
@@ -56,7 +47,6 @@
 * Return an error on write if write_options.sync = true and write_options.disableWAL = true to warn user of inconsistent options. Previously we will not write to WAL and not respecting the sync options in this case.
 
 ### New Features
-* CRC32C is now using the 3-way pipelined SSE algorithm `crc32c_3way` on supported platforms to improve performance. The system will choose to use this algorithm on supported platforms automatically whenever possible. If PCLMULQDQ is not supported it will fall back to the old Fast_CRC32 algorithm.
 * `DBOptions::writable_file_max_buffer_size` can now be changed dynamically.
 * `DBOptions::bytes_per_sync`, `DBOptions::compaction_readahead_size`, and `DBOptions::wal_bytes_per_sync` can now be changed dynamically, `DBOptions::wal_bytes_per_sync` will flush all memtables and switch to a new WAL file.
 * Support dynamic adjustment of rate limit according to demand for background I/O. It can be enabled by passing `true` to the `auto_tuned` parameter in `NewGenericRateLimiter()`. The value passed as `rate_bytes_per_sec` will still be respected as an upper-bound.

Makefile

@@ -509,7 +509,6 @@ PARALLEL_TEST = \
 	backupable_db_test \
 	db_compaction_filter_test \
 	db_compaction_test \
-	db_merge_operator_test \
 	db_sst_test \
 	db_test \
 	db_universal_compaction_test \
@@ -521,7 +520,7 @@ PARALLEL_TEST = \
 	persistent_cache_test \
 	table_test \
 	transaction_test \
-	write_prepared_transaction_test \
+	write_prepared_transaction_test
 
 SUBSET := $(TESTS)
 ifdef ROCKSDBTESTS_START
@@ -1556,11 +1555,11 @@ BZIP2_DOWNLOAD_BASE ?= http://www.bzip.org
 SNAPPY_VER ?= 1.1.4
 SNAPPY_SHA256 ?= 134bfe122fd25599bb807bb8130e7ba6d9bdb851e0b16efcb83ac4f5d0b70057
 SNAPPY_DOWNLOAD_BASE ?= https://github.com/google/snappy/releases/download
-LZ4_VER ?= 1.8.0
-LZ4_SHA256 ?= 2ca482ea7a9bb103603108b5a7510b7592b90158c151ff50a28f1ca8389fccf6
+LZ4_VER ?= 1.7.5
+LZ4_SHA256 ?= 0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
 LZ4_DOWNLOAD_BASE ?= https://github.com/lz4/lz4/archive
-ZSTD_VER ?= 1.3.3
-ZSTD_SHA256 ?= a77c47153ee7de02626c5b2a097005786b71688be61e9fb81806a011f90b297b
+ZSTD_VER ?= 1.2.0
+ZSTD_SHA256 ?= 4a7e4593a3638276ca7f2a09dc4f38e674d8317bbea51626393ca73fc047cbfb
 ZSTD_DOWNLOAD_BASE ?= https://github.com/facebook/zstd/archive
 
 ifeq ($(PLATFORM), OS_MACOSX)

TARGETS

@@ -157,7 +157,6 @@ cpp_library(
         "table/block_based_table_factory.cc",
         "table/block_based_table_reader.cc",
         "table/block_builder.cc",
-        "table/block_fetcher.cc",
         "table/block_prefix_index.cc",
         "table/bloom_block.cc",
         "table/cuckoo_table_builder.cc",
@@ -242,7 +241,6 @@ cpp_library(
         "utilities/leveldb_options/leveldb_options.cc",
         "utilities/lua/rocks_lua_compaction_filter.cc",
         "utilities/memory/memory_util.cc",
-        "utilities/merge_operators/bytesxor.cc",
         "utilities/merge_operators/max.cc",
         "utilities/merge_operators/put.cc",
         "utilities/merge_operators/string_append/stringappend.cc",
@@ -568,7 +566,7 @@ ROCKS_TESTS = [
     [
         "db_merge_operator_test",
         "db/db_merge_operator_test.cc",
-        "parallel",
+        "serial",
     ],
     [
         "db_options_test",
@@ -1018,7 +1016,7 @@ ROCKS_TESTS = [
     [
         "write_prepared_transaction_test",
         "utilities/transactions/write_prepared_transaction_test.cc",
-        "parallel",
+        "serial",
     ],
 ]
 

appveyor.yml

@@ -3,7 +3,7 @@ image: Visual Studio 2015
 before_build:
 - md %APPVEYOR_BUILD_FOLDER%\build
 - cd %APPVEYOR_BUILD_FOLDER%\build
-- cmake -G "Visual Studio 14 Win64" -DOPTDBG=1 -DWITH_XPRESS=1 -DPORTABLE=1 ..
+- cmake -G "Visual Studio 14 2015 Win64" -DOPTDBG=1 -DXPRESS=1 -DPORTABLE=1 ..
 - cd ..
 build:
   project: build\rocksdb.sln

db/c.cc

@@ -1988,11 +1988,6 @@ void rocksdb_options_optimize_universal_style_compaction(
   opt->rep.OptimizeUniversalStyleCompaction(memtable_memory_budget);
 }
 
-void rocksdb_options_set_allow_ingest_behind(
-    rocksdb_options_t* opt, unsigned char v) {
-  opt->rep.allow_ingest_behind = v;
-}
-
 void rocksdb_options_set_compaction_filter(
     rocksdb_options_t* opt,
     rocksdb_compactionfilter_t* filter) {

db/compaction_iterator.cc

@@ -184,11 +184,8 @@ void CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
                                               Slice* skip_until) {
   if (compaction_filter_ != nullptr &&
       (ikey_.type == kTypeValue || ikey_.type == kTypeBlobIndex) &&
-      (visible_at_tip_ || ignore_snapshots_ ||
-       ikey_.sequence > latest_snapshot_ ||
-       (snapshot_checker_ != nullptr &&
-        UNLIKELY(!snapshot_checker_->IsInSnapshot(ikey_.sequence,
-                                                  latest_snapshot_))))) {
+      (visible_at_tip_ || ikey_.sequence > latest_snapshot_ ||
+       ignore_snapshots_)) {
     // If the user has specified a compaction filter and the sequence
     // number is greater than any external snapshot, then invoke the
     // filter. If the return value of the compaction filter is true,
@@ -414,10 +411,7 @@ void CompactionIterator::NextFromInput() {
           cmp_->Equal(ikey_.user_key, next_ikey.user_key)) {
         // Check whether the next key belongs to the same snapshot as the
         // SingleDelete.
-        if (prev_snapshot == 0 || next_ikey.sequence > prev_snapshot ||
-            (snapshot_checker_ != nullptr &&
-             UNLIKELY(!snapshot_checker_->IsInSnapshot(next_ikey.sequence,
-                                                       prev_snapshot)))) {
+        if (prev_snapshot == 0 || next_ikey.sequence > prev_snapshot) {
           if (next_ikey.type == kTypeSingleDeletion) {
             // We encountered two SingleDeletes in a row.  This could be due to
             // unexpected user input.
@@ -428,12 +422,8 @@ void CompactionIterator::NextFromInput() {
             // input_->Next().
             ++iter_stats_.num_record_drop_obsolete;
             ++iter_stats_.num_single_del_mismatch;
-          } else if (has_outputted_key_ ||
-                     (ikey_.sequence <= earliest_write_conflict_snapshot_ &&
-                      (snapshot_checker_ == nullptr ||
-                       LIKELY(snapshot_checker_->IsInSnapshot(
-                           ikey_.sequence,
-                           earliest_write_conflict_snapshot_))))) {
+          } else if ((ikey_.sequence <= earliest_write_conflict_snapshot_) ||
+                     has_outputted_key_) {
             // Found a matching value, we can drop the single delete and the
             // value.  It is safe to drop both records since we've already
             // outputted a key in this snapshot, or there is no earlier
@@ -481,9 +471,6 @@ void CompactionIterator::NextFromInput() {
         // comparison, so the value of has_current_user_key does not matter.
         has_current_user_key_ = false;
         if (compaction_ != nullptr && ikey_.sequence <= earliest_snapshot_ &&
-            (snapshot_checker_ == nullptr ||
-             LIKELY(snapshot_checker_->IsInSnapshot(ikey_.sequence,
-                                                    earliest_snapshot_))) &&
             compaction_->KeyNotExistsBeyondOutputLevel(ikey_.user_key,
                                                        &level_ptrs_)) {
           // Key doesn't exist outside of this range.
@@ -517,9 +504,6 @@ void CompactionIterator::NextFromInput() {
       input_->Next();
     } else if (compaction_ != nullptr && ikey_.type == kTypeDeletion &&
                ikey_.sequence <= earliest_snapshot_ &&
-               (snapshot_checker_ == nullptr ||
-                LIKELY(snapshot_checker_->IsInSnapshot(ikey_.sequence,
-                                                       earliest_snapshot_))) &&
                ikeyNotNeededForIncrementalSnapshot() &&
                compaction_->KeyNotExistsBeyondOutputLevel(ikey_.user_key,
                                                           &level_ptrs_)) {
@@ -554,10 +538,6 @@ void CompactionIterator::NextFromInput() {
       // have hit (A)
       // We encapsulate the merge related state machine in a different
       // object to minimize change to the existing flow.
-      // In case snapshot_checker is present, we can probably merge further
-      // beyond prev_snapshot, since there could be more keys with sequence
-      // smaller than prev_snapshot, but reported by snapshot_checker as not
-      // visible by prev_snapshot. But it will make the logic more complicated.
       Status s = merge_helper_->MergeUntil(input_, range_del_agg_,
                                            prev_snapshot, bottommost_level_);
       merge_out_iter_.SeekToFirst();

db/db_flush_test.cc

@@ -137,7 +137,7 @@ TEST_F(DBFlushTest, ManualFlushWithMinWriteBufferNumberToMerge) {
       {{"DBImpl::BGWorkFlush",
         "DBFlushTest::ManualFlushWithMinWriteBufferNumberToMerge:1"},
        {"DBFlushTest::ManualFlushWithMinWriteBufferNumberToMerge:2",
-        "FlushJob::WriteLevel0Table"}});
+        "DBImpl::FlushMemTableToOutputFile:BeforeInstallSV"}});
   SyncPoint::GetInstance()->EnableProcessing();
 
   ASSERT_OK(Put("key1", "value1"));

db/db_impl.cc

@@ -1510,8 +1510,7 @@ ArenaWrappedDBIter* DBImpl::NewIteratorImpl(const ReadOptions& read_options,
                                             ColumnFamilyData* cfd,
                                             SequenceNumber snapshot,
                                             ReadCallback* read_callback,
-                                            bool allow_blob,
-                                            bool allow_refresh) {
+                                            bool allow_blob) {
   SuperVersion* sv = cfd->GetReferencedSuperVersion(&mutex_);
 
   // Try to generate a DB iterator tree in continuous memory area to be
@@ -1560,8 +1559,7 @@ ArenaWrappedDBIter* DBImpl::NewIteratorImpl(const ReadOptions& read_options,
       env_, read_options, *cfd->ioptions(), snapshot,
       sv->mutable_cf_options.max_sequential_skip_in_iterations,
       sv->version_number, read_callback,
-      ((read_options.snapshot != nullptr) ? nullptr : this), cfd, allow_blob,
-      allow_refresh);
+      ((read_options.snapshot != nullptr) ? nullptr : this), cfd, allow_blob);
 
   InternalIterator* internal_iter =
       NewInternalIterator(read_options, cfd, sv, db_iter->GetArena(),
@@ -1684,6 +1682,12 @@ void DBImpl::ReleaseSnapshot(const Snapshot* s) {
   delete casted_s;
 }
 
+bool DBImpl::HasActiveSnapshotInRange(SequenceNumber lower_bound,
+                                      SequenceNumber upper_bound) {
+  InstrumentedMutexLock l(&mutex_);
+  return snapshots_.HasSnapshotInRange(lower_bound, upper_bound);
+}
+
 #ifndef ROCKSDB_LITE
 Status DBImpl::GetPropertiesOfAllTables(ColumnFamilyHandle* column_family,
                                         TablePropertiesCollection* props) {

db/db_impl.h

@@ -148,8 +148,7 @@ class DBImpl : public DB {
                                       ColumnFamilyData* cfd,
                                       SequenceNumber snapshot,
                                       ReadCallback* read_callback,
-                                      bool allow_blob = false,
-                                      bool allow_refresh = true);
+                                      bool allow_blob = false);
 
   virtual const Snapshot* GetSnapshot() override;
   virtual void ReleaseSnapshot(const Snapshot* snapshot) override;
@@ -230,6 +229,10 @@ class DBImpl : public DB {
 
   virtual bool SetPreserveDeletesSequenceNumber(SequenceNumber seqnum) override;
 
+  // Whether there is an active snapshot in range [lower_bound, upper_bound).
+  bool HasActiveSnapshotInRange(SequenceNumber lower_bound,
+                                SequenceNumber upper_bound);
+
 #ifndef ROCKSDB_LITE
   using DB::ResetStats;
   virtual Status ResetStats() override;
@@ -951,7 +954,7 @@ class DBImpl : public DB {
   // from the same write_thread_ without any locks.
   uint64_t logfile_number_;
   std::deque<uint64_t>
-      log_recycle_files_;  // a list of log files that we can recycle
+      log_recycle_files;  // a list of log files that we can recycle
   bool log_dir_synced_;
   // Without two_write_queues, read and writes to log_empty_ are protected by
   // mutex_. Since it is currently updated/read only in write_thread_, it can be

db/db_impl_compaction_flush.cc

@@ -134,6 +134,7 @@ Status DBImpl::FlushMemTableToOutputFile(
   }
 
   if (s.ok()) {
+    TEST_SYNC_POINT("DBImpl::FlushMemTableToOutputFile:BeforeInstallSV");
     InstallSuperVersionAndScheduleWork(cfd, &job_context->superversion_context,
                                        mutable_cf_options);
     if (made_progress) {

db/db_impl_files.cc

@@ -238,11 +238,11 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
     while (alive_log_files_.begin()->number < min_log_number) {
       auto& earliest = *alive_log_files_.begin();
       if (immutable_db_options_.recycle_log_file_num >
-          log_recycle_files_.size()) {
+          log_recycle_files.size()) {
         ROCKS_LOG_INFO(immutable_db_options_.info_log,
                        "adding log %" PRIu64 " to recycle list\n",
                        earliest.number);
-        log_recycle_files_.push_back(earliest.number);
+        log_recycle_files.push_back(earliest.number);
       } else {
         job_context->log_delete_files.push_back(earliest.number);
       }
@@ -283,8 +283,8 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
   // We're just cleaning up for DB::Write().
   assert(job_context->logs_to_free.empty());
   job_context->logs_to_free = logs_to_free_;
-  job_context->log_recycle_files.assign(log_recycle_files_.begin(),
-                                        log_recycle_files_.end());
+  job_context->log_recycle_files.assign(log_recycle_files.begin(),
+                                        log_recycle_files.end());
   logs_to_free_.clear();
 }
 

db/db_impl_write.cc

@@ -521,6 +521,9 @@ Status DBImpl::WriteImplWALOnly(const WriteOptions& write_options,
   PERF_TIMER_GUARD(write_pre_and_post_process_time);
   WriteThread::Writer w(write_options, my_batch, callback, log_ref,
                         true /* disable_memtable */, pre_release_callback);
+  if (write_options.disableWAL) {
+    return status;
+  }
   RecordTick(stats_, WRITE_WITH_WAL);
   StopWatch write_sw(env_, immutable_db_options_.statistics.get(), DB_WRITE);
 
@@ -577,13 +580,7 @@ Status DBImpl::WriteImplWALOnly(const WriteOptions& write_options,
   // LastAllocatedSequence is increased inside WriteToWAL under
   // wal_write_mutex_ to ensure ordered events in WAL
   size_t seq_inc = seq_per_batch_ ? write_group.size : 0 /*total_count*/;
-  if (!write_options.disableWAL) {
-    status =
-        ConcurrentWriteToWAL(write_group, log_used, &last_sequence, seq_inc);
-  } else {
-    // Otherwise we inc seq number to do solely the seq allocation
-    last_sequence = versions_->FetchAddLastAllocatedSequence(seq_inc);
-  }
+  status = ConcurrentWriteToWAL(write_group, log_used, &last_sequence, seq_inc);
   auto curr_seq = last_sequence + 1;
   for (auto* writer : write_group) {
     if (writer->CallbackFailed()) {
@@ -596,7 +593,6 @@ Status DBImpl::WriteImplWALOnly(const WriteOptions& write_options,
     // else seq advances only by memtable writes
   }
   if (status.ok() && write_options.sync) {
-    assert(!write_options.disableWAL);
     // Requesting sync with two_write_queues_ is expected to be very rare. We
     // hance provide a simple implementation that is not necessarily efficient.
     if (manual_wal_flush_) {
@@ -697,7 +693,7 @@ Status DBImpl::PreprocessWrite(const WriteOptions& write_options,
   }
 
   if (UNLIKELY(status.ok() && !bg_error_.ok())) {
-    status = bg_error_;
+    return bg_error_;
   }
 
   if (UNLIKELY(status.ok() && !flush_scheduler_.Empty())) {
@@ -1215,9 +1211,9 @@ Status DBImpl::SwitchMemtable(ColumnFamilyData* cfd, WriteContext* context) {
   }
   uint64_t recycle_log_number = 0;
   if (creating_new_log && immutable_db_options_.recycle_log_file_num &&
-      !log_recycle_files_.empty()) {
-    recycle_log_number = log_recycle_files_.front();
-    log_recycle_files_.pop_front();
+      !log_recycle_files.empty()) {
+    recycle_log_number = log_recycle_files.front();
+    log_recycle_files.pop_front();
   }
   uint64_t new_log_number =
       creating_new_log ? versions_->NewFileNumber() : logfile_number_;

db/db_iter.cc

@@ -1381,19 +1381,17 @@ void ArenaWrappedDBIter::Init(Env* env, const ReadOptions& read_options,
                               const SequenceNumber& sequence,
                               uint64_t max_sequential_skip_in_iteration,
                               uint64_t version_number,
-                              ReadCallback* read_callback, bool allow_blob,
-                              bool allow_refresh) {
+                              ReadCallback* read_callback, bool allow_blob) {
   auto mem = arena_.AllocateAligned(sizeof(DBIter));
   db_iter_ = new (mem)
       DBIter(env, read_options, cf_options, cf_options.user_comparator, nullptr,
              sequence, true, max_sequential_skip_in_iteration, read_callback,
              allow_blob);
   sv_number_ = version_number;
-  allow_refresh_ = allow_refresh;
 }
 
 Status ArenaWrappedDBIter::Refresh() {
-  if (cfd_ == nullptr || db_impl_ == nullptr || !allow_refresh_) {
+  if (cfd_ == nullptr || db_impl_ == nullptr) {
     return Status::NotSupported("Creating renew iterator is not allowed.");
   }
   assert(db_iter_ != nullptr);
@@ -1411,7 +1409,7 @@ Status ArenaWrappedDBIter::Refresh() {
     SuperVersion* sv = cfd_->GetReferencedSuperVersion(db_impl_->mutex());
     Init(env, read_options_, *(cfd_->ioptions()), latest_seq,
          sv->mutable_cf_options.max_sequential_skip_in_iterations,
-         cur_sv_number, read_callback_, allow_blob_, allow_refresh_);
+         cur_sv_number, read_callback_, allow_blob_);
 
     InternalIterator* internal_iter = db_impl_->NewInternalIterator(
         read_options_, cfd_, sv, &arena_, db_iter_->GetRangeDelAggregator());
@@ -1428,12 +1426,12 @@ ArenaWrappedDBIter* NewArenaWrappedDbIterator(
     const ImmutableCFOptions& cf_options, const SequenceNumber& sequence,
     uint64_t max_sequential_skip_in_iterations, uint64_t version_number,
     ReadCallback* read_callback, DBImpl* db_impl, ColumnFamilyData* cfd,
-    bool allow_blob, bool allow_refresh) {
+    bool allow_blob) {
   ArenaWrappedDBIter* iter = new ArenaWrappedDBIter();
   iter->Init(env, read_options, cf_options, sequence,
              max_sequential_skip_in_iterations, version_number, read_callback,
-             allow_blob, allow_refresh);
-  if (db_impl != nullptr && cfd != nullptr && allow_refresh) {
+             allow_blob);
+  if (db_impl != nullptr && cfd != nullptr) {
     iter->StoreRefreshInfo(read_options, db_impl, cfd, read_callback,
                            allow_blob);
   }

db/db_iter.h

@@ -73,7 +73,7 @@ class ArenaWrappedDBIter : public Iterator {
             const ImmutableCFOptions& cf_options,
             const SequenceNumber& sequence,
             uint64_t max_sequential_skip_in_iterations, uint64_t version_number,
-            ReadCallback* read_callback, bool allow_blob, bool allow_refresh);
+            ReadCallback* read_callback, bool allow_blob);
 
   void StoreRefreshInfo(const ReadOptions& read_options, DBImpl* db_impl,
                         ColumnFamilyData* cfd, ReadCallback* read_callback,
@@ -94,7 +94,6 @@ class ArenaWrappedDBIter : public Iterator {
   ReadOptions read_options_;
   ReadCallback* read_callback_;
   bool allow_blob_ = false;
-  bool allow_refresh_ = true;
 };
 
 // Generate the arena wrapped iterator class.
@@ -105,6 +104,6 @@ extern ArenaWrappedDBIter* NewArenaWrappedDbIterator(
     const ImmutableCFOptions& cf_options, const SequenceNumber& sequence,
     uint64_t max_sequential_skip_in_iterations, uint64_t version_number,
     ReadCallback* read_callback, DBImpl* db_impl = nullptr,
-    ColumnFamilyData* cfd = nullptr, bool allow_blob = false,
-    bool allow_refresh = true);
+    ColumnFamilyData* cfd = nullptr, bool allow_blob = false);
+
 }  // namespace rocksdb

db/db_sst_test.cc

@@ -376,30 +376,6 @@ TEST_F(DBSSTTest, RateLimitedDelete) {
   rocksdb::SyncPoint::GetInstance()->DisableProcessing();
 }
 
-TEST_F(DBSSTTest, OpenDBWithExistingTrash) {
-  Options options = CurrentOptions();
-
-  options.sst_file_manager.reset(
-      NewSstFileManager(env_, nullptr, "", 1024 * 1024 /* 1 MB/sec */));
-  auto sfm = static_cast<SstFileManagerImpl*>(options.sst_file_manager.get());
-
-  Destroy(last_options_);
-
-  // Add some trash files to the db directory so the DB can clean them up
-  env_->CreateDirIfMissing(dbname_);
-  ASSERT_OK(WriteStringToFile(env_, "abc", dbname_ + "/" + "001.sst.trash"));
-  ASSERT_OK(WriteStringToFile(env_, "abc", dbname_ + "/" + "002.sst.trash"));
-  ASSERT_OK(WriteStringToFile(env_, "abc", dbname_ + "/" + "003.sst.trash"));
-
-  // Reopen the DB and verify that it deletes existing trash files
-  ASSERT_OK(TryReopen(options));
-  sfm->WaitForEmptyTrash();
-  ASSERT_NOK(env_->FileExists(dbname_ + "/" + "001.sst.trash"));
-  ASSERT_NOK(env_->FileExists(dbname_ + "/" + "002.sst.trash"));
-  ASSERT_NOK(env_->FileExists(dbname_ + "/" + "003.sst.trash"));
-}
-
-
 // Create a DB with 2 db_paths, and generate multiple files in the 2
 // db_paths using CompactRangeOptions, make sure that files that were
 // deleted from first db_path were deleted using DeleteScheduler and

db/db_test.cc

@@ -3488,16 +3488,12 @@ TEST_F(DBTest, GetThreadStatus) {
     const int kTestCount = 3;
     const unsigned int kHighPriCounts[kTestCount] = {3, 2, 5};
     const unsigned int kLowPriCounts[kTestCount] = {10, 15, 3};
-    const unsigned int kBottomPriCounts[kTestCount] = {2, 1, 4};
     for (int test = 0; test < kTestCount; ++test) {
       // Change the number of threads in high / low priority pool.
       env_->SetBackgroundThreads(kHighPriCounts[test], Env::HIGH);
       env_->SetBackgroundThreads(kLowPriCounts[test], Env::LOW);
-      env_->SetBackgroundThreads(kBottomPriCounts[test], Env::BOTTOM);
       // Wait to ensure the all threads has been registered
       unsigned int thread_type_counts[ThreadStatus::NUM_THREAD_TYPES];
-      // TODO(ajkr): it'd be better if SetBackgroundThreads returned only after
-      // all threads have been registered.
       // Try up to 60 seconds.
       for (int num_try = 0; num_try < 60000; num_try++) {
         env_->SleepForMicroseconds(1000);
@@ -3512,21 +3508,20 @@ TEST_F(DBTest, GetThreadStatus) {
         if (thread_type_counts[ThreadStatus::HIGH_PRIORITY] ==
                 kHighPriCounts[test] &&
             thread_type_counts[ThreadStatus::LOW_PRIORITY] ==
-                kLowPriCounts[test] &&
-            thread_type_counts[ThreadStatus::BOTTOM_PRIORITY] ==
-                kBottomPriCounts[test]) {
+                kLowPriCounts[test]) {
           break;
         }
       }
+      // Verify the total number of threades
+      ASSERT_EQ(thread_type_counts[ThreadStatus::HIGH_PRIORITY] +
+                    thread_type_counts[ThreadStatus::LOW_PRIORITY],
+                kHighPriCounts[test] + kLowPriCounts[test]);
       // Verify the number of high-priority threads
       ASSERT_EQ(thread_type_counts[ThreadStatus::HIGH_PRIORITY],
                 kHighPriCounts[test]);
       // Verify the number of low-priority threads
       ASSERT_EQ(thread_type_counts[ThreadStatus::LOW_PRIORITY],
                 kLowPriCounts[test]);
-      // Verify the number of bottom-priority threads
-      ASSERT_EQ(thread_type_counts[ThreadStatus::BOTTOM_PRIORITY],
-                kBottomPriCounts[test]);
     }
     if (i == 0) {
       // repeat the test with multiple column families
@@ -4380,6 +4375,7 @@ TEST_F(DBTest, DynamicFIFOCompactionOptions) {
   ASSERT_EQ(dbfull()->GetOptions().compaction_options_fifo.allow_compaction,
             true);
 }
+#endif  // ROCKSDB_LITE
 
 TEST_F(DBTest, DynamicUniversalCompactionOptions) {
   Options options;
@@ -4448,7 +4444,6 @@ TEST_F(DBTest, DynamicUniversalCompactionOptions) {
       dbfull()->GetOptions().compaction_options_universal.allow_trivial_move,
       false);
 }
-#endif  // ROCKSDB_LITE
 
 TEST_F(DBTest, FileCreationRandomFailure) {
   Options options;

db/db_test_util.cc

@@ -1157,13 +1157,11 @@ UpdateStatus DBTestBase::updateInPlaceNoAction(char* prevValue,
 
 // Utility method to test InplaceUpdate
 void DBTestBase::validateNumberOfEntries(int numValues, int cf) {
+  ScopedArenaIterator iter;
   Arena arena;
   auto options = CurrentOptions();
   InternalKeyComparator icmp(options.comparator);
   RangeDelAggregator range_del_agg(icmp, {} /* snapshots */);
-  // This should be defined after range_del_agg so that it destructs the
-  // assigned iterator before it range_del_agg is already destructed.
-  ScopedArenaIterator iter;
   if (cf != 0) {
     iter.set(
         dbfull()->NewInternalIterator(&arena, &range_del_agg, handles_[cf]));

db/db_write_test.cc

@@ -39,6 +39,52 @@ TEST_P(DBWriteTest, SyncAndDisableWAL) {
   ASSERT_TRUE(dbfull()->Write(write_options, &batch).IsInvalidArgument());
 }
 
+// Sequence number should be return through input write batch.
+TEST_P(DBWriteTest, ReturnSeuqneceNumber) {
+  Random rnd(4422);
+  Open();
+  for (int i = 0; i < 100; i++) {
+    WriteBatch batch;
+    batch.Put("key" + ToString(i), test::RandomHumanReadableString(&rnd, 10));
+    ASSERT_OK(dbfull()->Write(WriteOptions(), &batch));
+    ASSERT_EQ(dbfull()->GetLatestSequenceNumber(),
+              WriteBatchInternal::Sequence(&batch));
+  }
+}
+
+TEST_P(DBWriteTest, ReturnSeuqneceNumberMultiThreaded) {
+  constexpr size_t kThreads = 16;
+  constexpr size_t kNumKeys = 1000;
+  Open();
+  ASSERT_EQ(0, dbfull()->GetLatestSequenceNumber());
+  // Check each sequence is used once and only once.
+  std::vector<std::atomic_flag> flags(kNumKeys * kThreads + 1);
+  for (size_t i = 0; i < flags.size(); i++) {
+    flags[i].clear();
+  }
+  auto writer = [&](size_t id) {
+    Random rnd(4422 + static_cast<uint32_t>(id));
+    for (size_t k = 0; k < kNumKeys; k++) {
+      WriteBatch batch;
+      batch.Put("key" + ToString(id) + "-" + ToString(k),
+                test::RandomHumanReadableString(&rnd, 10));
+      ASSERT_OK(dbfull()->Write(WriteOptions(), &batch));
+      SequenceNumber sequence = WriteBatchInternal::Sequence(&batch);
+      ASSERT_GT(sequence, 0);
+      ASSERT_LE(sequence, kNumKeys * kThreads);
+      // The sequence isn't consumed by someone else.
+      ASSERT_FALSE(flags[sequence].test_and_set());
+    }
+  };
+  std::vector<port::Thread> threads;
+  for (size_t i = 0; i < kThreads; i++) {
+    threads.emplace_back(writer, i);
+  }
+  for (size_t i = 0; i < kThreads; i++) {
+    threads[i].join();
+  }
+}
+
 TEST_P(DBWriteTest, IOErrorOnWALWritePropagateToWriteThreadFollower) {
   constexpr int kNumThreads = 5;
   std::unique_ptr<FaultInjectionTestEnv> mock_env(

db/flush_job.cc

@@ -364,7 +364,6 @@ Status FlushJob::WriteLevel0Table() {
   InternalStats::CompactionStats stats(1);
   stats.micros = db_options_.env->NowMicros() - start_micros;
   stats.bytes_written = meta_.fd.GetFileSize();
-  MeasureTime(stats_, FLUSH_TIME, stats.micros);
   cfd_->internal_stats()->AddCompactionStats(0 /* level */, stats);
   cfd_->internal_stats()->AddCFStats(InternalStats::BYTES_FLUSHED,
                                      meta_.fd.GetFileSize());

db/flush_job_test.cc

@@ -40,7 +40,6 @@ class FlushJobTest : public testing::Test {
     EXPECT_OK(env_->CreateDirIfMissing(dbname_));
     db_options_.db_paths.emplace_back(dbname_,
                                       std::numeric_limits<uint64_t>::max());
-    db_options_.statistics = rocksdb::CreateDBStatistics();
     // TODO(icanadi) Remove this once we mock out VersionSet
     NewDB();
     std::vector<ColumnFamilyDescriptor> column_families;
@@ -139,22 +138,16 @@ TEST_F(FlushJobTest, NonEmpty) {
 
   EventLogger event_logger(db_options_.info_log.get());
   SnapshotChecker* snapshot_checker = nullptr;  // not relavant
-  FlushJob flush_job(dbname_, versions_->GetColumnFamilySet()->GetDefault(),
-                     db_options_, *cfd->GetLatestMutableCFOptions(),
-                     env_options_, versions_.get(), &mutex_, &shutting_down_,
-                     {}, kMaxSequenceNumber, snapshot_checker, &job_context,
-                     nullptr, nullptr, nullptr, kNoCompression,
-                     db_options_.statistics.get(), &event_logger, true);
-
-  HistogramData hist;
+  FlushJob flush_job(
+      dbname_, versions_->GetColumnFamilySet()->GetDefault(), db_options_,
+      *cfd->GetLatestMutableCFOptions(), env_options_, versions_.get(), &mutex_,
+      &shutting_down_, {}, kMaxSequenceNumber, snapshot_checker, &job_context,
+      nullptr, nullptr, nullptr, kNoCompression, nullptr, &event_logger, true);
   FileMetaData fd;
   mutex_.Lock();
   flush_job.PickMemTable();
   ASSERT_OK(flush_job.Run(&fd));
   mutex_.Unlock();
-  db_options_.statistics->histogramData(FLUSH_TIME, &hist);
-  ASSERT_GT(hist.average, 0.0);
-
   ASSERT_EQ(ToString(0), fd.smallest.user_key().ToString());
   ASSERT_EQ("9999a",
             fd.largest.user_key().ToString());  // range tombstone end key
@@ -217,15 +210,12 @@ TEST_F(FlushJobTest, Snapshots) {
                      env_options_, versions_.get(), &mutex_, &shutting_down_,
                      snapshots, kMaxSequenceNumber, snapshot_checker,
                      &job_context, nullptr, nullptr, nullptr, kNoCompression,
-                     db_options_.statistics.get(), &event_logger, true);
+                     nullptr, &event_logger, true);
   mutex_.Lock();
   flush_job.PickMemTable();
   ASSERT_OK(flush_job.Run());
   mutex_.Unlock();
   mock_table_factory_->AssertSingleFile(inserted_keys);
-  HistogramData hist;
-  db_options_.statistics->histogramData(FLUSH_TIME, &hist);
-  ASSERT_GT(hist.average, 0.0);
   job_context.Clean();
 }
 

db/forward_iterator.cc

@@ -566,7 +566,7 @@ void ForwardIterator::RebuildIterators(bool refresh_sv) {
     sv_ = cfd_->GetReferencedSuperVersion(&(db_->mutex_));
   }
   RangeDelAggregator range_del_agg(
-      cfd_->internal_comparator(), {} /* snapshots */);
+      InternalKeyComparator(cfd_->internal_comparator()), {} /* snapshots */);
   mutable_iter_ = sv_->mem->NewIterator(read_options_, &arena_);
   sv_->imm->AddIterators(read_options_, &imm_iters_, &arena_);
   if (!read_options_.ignore_range_deletions) {
@@ -621,7 +621,7 @@ void ForwardIterator::RenewIterators() {
   mutable_iter_ = svnew->mem->NewIterator(read_options_, &arena_);
   svnew->imm->AddIterators(read_options_, &imm_iters_, &arena_);
   RangeDelAggregator range_del_agg(
-      cfd_->internal_comparator(), {} /* snapshots */);
+      InternalKeyComparator(cfd_->internal_comparator()), {} /* snapshots */);
   if (!read_options_.ignore_range_deletions) {
     std::unique_ptr<InternalIterator> range_del_iter(
         svnew->mem->NewRangeTombstoneIterator(read_options_));

db/snapshot_impl.h

@@ -108,6 +108,22 @@ class SnapshotList {
     return ret;
   }
 
+  // Whether there is an active snapshot in range [lower_bound, upper_bound).
+  bool HasSnapshotInRange(SequenceNumber lower_bound,
+                          SequenceNumber upper_bound) {
+    if (empty()) {
+      return false;
+    }
+    const SnapshotImpl* s = &list_;
+    while (s->next_ != &list_) {
+      if (s->next_->number_ >= lower_bound) {
+        return s->next_->number_ < upper_bound;
+      }
+      s = s->next_;
+    }
+    return false;
+  }
+
   // get the sequence number of the most recent snapshot
   SequenceNumber GetNewest() {
     if (empty()) {

docs/_posts/2017-12-18-17-auto-tuned-rate-limiter.markdown

@@ -1,28 +0,0 @@
----
-title: Auto-tuned Rate Limiter
-layout: post
-author: ajkr
-category: blog
----
-
-### Introduction
-
-Our rate limiter has been hard to configure since users need to pick a value that is low enough to prevent background I/O spikes, which can impact user-visible read/write latencies. Meanwhile, picking too low a value can cause memtables and L0 files to pile up, eventually leading to writes stalling. Tuning the rate limiter has been especially difficult for users whose DB instances have different workloads, or have workloads that vary over time, or commonly both.
-
-To address this, in RocksDB 5.9 we released a dynamic rate limiter that adjusts itself over time according to demand for background I/O. It can be enabled simply by passing `auto_tuned=true` in the `NewGenericRateLimiter()` call. In this case `rate_bytes_per_sec` will indicate the upper-bound of the window within which a rate limit will be picked dynamically. The chosen rate limit will be much lower unless absolutely necessary, so setting this to the device's maximum throughput is a reasonable choice on dedicated hosts.
-
-### Algorithm
-
-We use a simple multiplicative-increase, multiplicative-decrease algorithm. We measure demand for background I/O as the ratio of intervals where the rate limiter is drained. There are low and high watermarks for this ratio, which will trigger a change in rate limit when breached. The rate limit can move within a window bounded by the user-specified upper-bound, and a lower-bound that we derive internally. Users can expect this lower bound to be 1-2 orders of magnitude less than the provided upper-bound (so don't provide INT64_MAX as your upper-bound), although it's subject to change.
-
-### Benchmark Results
-
-Data is ingested at 10MB/s and the rate limiter was created with 1000MB/s as its upper bound. The dynamically chosen rate limit hovers around 125MB/s. The other clustering of points at 50MB/s is due to number of compaction threads being reduced to one when there's no compaction pressure. 
-
-![](/static/images/rate-limiter/write-KBps-series.png)
-
-![](/static/images/rate-limiter/auto-tuned-write-KBps-series.png)
-
-The following graph summarizes the above two time series graphs in CDF form. In particular, notice the p90 - p100 for background write rate are significantly lower with auto-tuned rate limiter enabled.
-
-![](/static/images/rate-limiter/write-KBps-cdf.png)

docs/_posts/2017-12-19-write-prepared-txn.markdown

@@ -1,37 +0,0 @@
----
-title: WritePrepared Transactions
-layout: post
-author: maysamyabandeh
-category: blog
----
-
-RocksDB supports both optimistic and pessimistic concurrency controls. The pessimistic transactions make use of locks to provide isolation between the transactions. The default write policy in pessimistic transactions is _WriteCommitted_, which means that the data is written to the DB, i.e., the memtable, only after the transaction is committed. This policy simplified the implementation but came with some limitations in throughput, transaction size, and variety in supported isolation levels. In the below, we explain these in detail and present the other write policies, _WritePrepared_ and _WriteUnprepared_. We then dive into the design of _WritePrepared_ transactions.
-
-> _WritePrepared_ are to be announced as production-ready soon.
-
-### WriteCommitted, Pros and Cons
-
-With _WriteCommitted_ write policy, the data is written to the memtable only after the transaction commits. This greatly simplifies the read path as any data that is read by other transactions can be assumed to be committed. This write policy, however, implies that the writes are buffered in memory in the meanwhile. This makes memory a bottleneck for large transactions. The delay of the commit phase in 2PC (two-phase commit) also becomes noticeable since most of the work, i.e., writing to memtable, is done at the commit phase. When the commit of multiple transactions are done in a serial fashion, such as in 2PC implementation of MySQL, the lengthy commit latency becomes a major contributor to lower throughput. Moreover this write policy cannot provide weaker isolation levels, such as READ UNCOMMITTED, that could potentially provide higher throughput for some applications.
-
-### Alternatives: _WritePrepared_ and _WriteUnprepared_
-
-To tackle the lengthy commit issue, we should do memtable writes at earlier phases of 2PC so that the commit phase become lightweight and fast. 2PC is composed of Write stage, where the transaction `::Put` is invoked, the prepare phase, where `::Prepare` is invoked (upon which the DB promises to commit the transaction if later is requested), and commit phase, where `::Commit` is invoked and the transaction writes become visible to all readers. To make the commit phase lightweight, the memtable write could be done at either `::Prepare` or `::Put` stages, resulting into _WritePrepared_ and _WriteUnprepared_ write policies respectively. The downside is that when another transaction is reading data, it would need a way to tell apart which data is committed, and if they are, whether they are committed before the transaction's start, i.e., in the read snapshot of the transaction. _WritePrepared_ would still have the issue of buffering the data, which makes the memory the bottleneck for large transactions. It however provides a good milestone for transitioning from _WriteCommitted_ to _WriteUnprepared_ write policy. Here we explain the design of _WritePrepared_ policy. We will cover the changes that make the design to also supported _WriteUnprepared_ in an upcoming post.
-
-### _WritePrepared_ in a nutshell
-
-These are the primary design questions that needs to be addressed:
-1) How do we identify the key/values in the DB with transactions that wrote them?
-2) How do we figure if a key/value written by transaction Txn_w is in the read snapshot of the reading transaction Txn_r?
-3) How do we rollback the data written by aborted transactions?
-
-With _WritePrepared_, a transaction still buffers the writes in a write batch object in memory. When 2PC `::Prepare` is called, it writes the in-memory write batch to the WAL (write-ahead log) as well as to the memtable(s) (one memtable per column family); We reuse the existing notion of sequence numbers in RocksDB to tag all the key/values in the same write batch with the same sequence number, `prepare_seq`, which is also used as the identifier for the transaction. At commit time, it writes a commit marker to the WAL, whose sequence number, `commit_seq`, will be used as the commit timestamp of the transaction. Before releasing the commit sequence number to the readers, it stores a mapping from `prepare_seq` to `commit_seq` in an in-memory data structure that we call _CommitCache_. When a transaction reading values from the DB (tagged with `prepare_seq`) it makes use of the _CommitCache_ to figure if `commit_seq` of the value is in its read snapshot. To rollback an aborted transaction, we apply the status before the transaction by making another write that cancels out the writes of the aborted transaction.
-
-The _CommitCache_ is a lock-free data structure that caches the recent commit entries. Looking up the entries in the cache must be enough for almost all th transactions that commit in a timely manner. When evicting the older entries from the cache, it still maintains some other data structures to cover the corner cases for transactions that takes abnormally too long to finish. We will cover them in the design details below.
-
-### Preliminary Results
-The full experimental results are to be reported soon. Here we present the improvement in tps observed in some preliminary experiments with MyRocks:
-* sysbench update-noindex: 25%
-* sysbench read-write: 7.6%
-* linkbench: 3.7%
-
-Learn more [here](https://github.com/facebook/rocksdb/wiki/WritePrepared-Transactions).

include/rocksdb/c.h

@@ -710,9 +710,6 @@ extern ROCKSDB_LIBRARY_API void rocksdb_options_optimize_level_style_compaction(
 extern ROCKSDB_LIBRARY_API void
 rocksdb_options_optimize_universal_style_compaction(
     rocksdb_options_t* opt, uint64_t memtable_memory_budget);
-extern ROCKSDB_LIBRARY_API void
-rocksdb_options_set_allow_ingest_behind(rocksdb_options_t*,
-                                                   unsigned char);
 extern ROCKSDB_LIBRARY_API void rocksdb_options_set_compaction_filter(
     rocksdb_options_t*, rocksdb_compactionfilter_t*);
 extern ROCKSDB_LIBRARY_API void rocksdb_options_set_compaction_filter_factory(

include/rocksdb/compaction_filter.h

@@ -94,6 +94,10 @@ class CompactionFilter {
   // be used by a single thread that is doing the compaction run, and this
   // call does not need to be thread-safe.  However, multiple filters may be
   // in existence and operating concurrently.
+  //
+  // The last paragraph is not true if you set max_subcompactions to more than
+  // 1. In that case, subcompaction from multiple threads may call a single
+  // CompactionFilter concurrently.
   virtual bool Filter(int level, const Slice& key, const Slice& existing_value,
                       std::string* new_value, bool* value_changed) const {
     return false;

include/rocksdb/statistics.h

@@ -510,8 +510,6 @@ enum Histograms : uint32_t {
   BLOB_DB_COMPRESSION_MICROS,
   // BlobDB decompression time.
   BLOB_DB_DECOMPRESSION_MICROS,
-  // Time spent flushing memtable to disk
-  FLUSH_TIME,
 
   HISTOGRAM_ENUM_MAX,  // TODO(ldemailly): enforce HistogramsNameMap match
 };
@@ -562,7 +560,6 @@ const std::vector<std::pair<Histograms, std::string>> HistogramsNameMap = {
     {BLOB_DB_GC_MICROS, "rocksdb.blobdb.gc.micros"},
     {BLOB_DB_COMPRESSION_MICROS, "rocksdb.blobdb.compression.micros"},
     {BLOB_DB_DECOMPRESSION_MICROS, "rocksdb.blobdb.decompression.micros"},
-    {FLUSH_TIME, "rocksdb.db.flush.micros"},
 };
 
 struct HistogramData {

include/rocksdb/thread_status.h

@@ -45,7 +45,6 @@ struct ThreadStatus {
     HIGH_PRIORITY = 0,  // RocksDB BG thread in high-pri thread pool
     LOW_PRIORITY,  // RocksDB BG thread in low-pri thread pool
     USER,  // User thread (Non-RocksDB BG thread)
-    BOTTOM_PRIORITY,  // RocksDB BG thread in bottom-pri thread pool
     NUM_THREAD_TYPES
   };
 
@@ -164,7 +163,7 @@ struct ThreadStatus {
   // The followings are a set of utility functions for interpreting
   // the information of ThreadStatus
 
-  static std::string GetThreadTypeName(ThreadType thread_type);
+  static const std::string& GetThreadTypeName(ThreadType thread_type);
 
   // Obtain the name of an operation given its type.
   static const std::string& GetOperationName(OperationType op_type);

include/rocksdb/version.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #define ROCKSDB_MAJOR 5
-#define ROCKSDB_MINOR 11
-#define ROCKSDB_PATCH 4
+#define ROCKSDB_MINOR 10
+#define ROCKSDB_PATCH 5
 
 // Do not use these. We made the mistake of declaring macros starting with
 // double underscore. Now we have to live with our choice. We'll deprecate these

java/CMakeLists.txt

@@ -24,7 +24,6 @@ set(JNI_NATIVE_SOURCES
         rocksjni/lru_cache.cc
         rocksjni/memtablejni.cc
         rocksjni/merge_operator.cc
-        rocksjni/native_comparator_wrapper_test.cc
         rocksjni/options.cc
         rocksjni/options_util.cc
         rocksjni/ratelimiterjni.cc
@@ -88,8 +87,6 @@ set(NATIVE_JAVA_CLASSES
         org.rocksdb.LRUCache
         org.rocksdb.MemTableConfig
         org.rocksdb.MergeOperator
-        org.rocksdb.NativeComparatorWrapper
-        org.rocksdb.NativeComparatorWrapperTest.NativeStringComparatorWrapper
         org.rocksdb.NativeLibraryLoader
         org.rocksdb.Options
         org.rocksdb.OptionsUtil
@@ -125,8 +122,6 @@ set(NATIVE_JAVA_CLASSES
         org.rocksdb.WriteBatchTestInternalHelper
         org.rocksdb.WriteBatchWithIndex
         org.rocksdb.WriteOptions
-        org.rocksdb.util.CapturingWriteBatchHandler
-        org.rocksdb.util.WriteBatchGetter
 )
 
 include(FindJava)
@@ -182,7 +177,6 @@ add_jar(
   src/main/java/org/rocksdb/CompactionStyle.java
   src/main/java/org/rocksdb/Comparator.java
   src/main/java/org/rocksdb/ComparatorOptions.java
-  src/main/java/org/rocksdb/ComparatorType.java
   src/main/java/org/rocksdb/CompressionOptions.java
   src/main/java/org/rocksdb/CompressionType.java
   src/main/java/org/rocksdb/DBOptions.java
@@ -209,13 +203,11 @@ add_jar(
   src/main/java/org/rocksdb/MergeOperator.java
   src/main/java/org/rocksdb/MutableColumnFamilyOptions.java
   src/main/java/org/rocksdb/MutableColumnFamilyOptionsInterface.java
-  src/main/java/org/rocksdb/NativeComparatorWrapper.java
   src/main/java/org/rocksdb/NativeLibraryLoader.java
   src/main/java/org/rocksdb/Options.java
   src/main/java/org/rocksdb/OptionsUtil.java
   src/main/java/org/rocksdb/PlainTableConfig.java
   src/main/java/org/rocksdb/RateLimiter.java
-  src/main/java/org/rocksdb/RateLimiterMode.java
   src/main/java/org/rocksdb/ReadOptions.java
   src/main/java/org/rocksdb/ReadTier.java
   src/main/java/org/rocksdb/RemoveEmptyValueCompactionFilter.java
@@ -251,14 +243,11 @@ add_jar(
   src/main/java/org/rocksdb/WriteOptions.java
   src/test/java/org/rocksdb/BackupEngineTest.java
   src/test/java/org/rocksdb/IngestExternalFileOptionsTest.java
-  src/test/java/org/rocksdb/NativeComparatorWrapperTest.java
   src/test/java/org/rocksdb/PlatformRandomHelper.java
   src/test/java/org/rocksdb/RocksDBExceptionTest.java
   src/test/java/org/rocksdb/RocksMemoryResource.java
   src/test/java/org/rocksdb/SnapshotTest.java
   src/test/java/org/rocksdb/WriteBatchTest.java
-  src/test/java/org/rocksdb/util/CapturingWriteBatchHandler.java
-  src/test/java/org/rocksdb/util/WriteBatchGetter.java
   INCLUDE_JARS ${JAVA_TESTCLASSPATH}
 )
 

java/Makefile

@@ -1,7 +1,6 @@
 NATIVE_JAVA_CLASSES = org.rocksdb.AbstractCompactionFilter\
 	org.rocksdb.AbstractCompactionFilterFactory\
 	org.rocksdb.AbstractSlice\
-	org.rocksdb.AbstractTransactionNotifier\
 	org.rocksdb.BackupEngine\
 	org.rocksdb.BackupableDBOptions\
 	org.rocksdb.BlockBasedTableConfig\
@@ -30,9 +29,6 @@ NATIVE_JAVA_CLASSES = org.rocksdb.AbstractCompactionFilter\
 	org.rocksdb.Logger\
 	org.rocksdb.LRUCache\
 	org.rocksdb.MergeOperator\
-	org.rocksdb.NativeComparatorWrapper\
-	org.rocksdb.OptimisticTransactionDB\
-	org.rocksdb.OptimisticTransactionOptions\
 	org.rocksdb.Options\
 	org.rocksdb.OptionsUtil\
 	org.rocksdb.PlainTableConfig\
@@ -49,10 +45,6 @@ NATIVE_JAVA_CLASSES = org.rocksdb.AbstractCompactionFilter\
 	org.rocksdb.Slice\
 	org.rocksdb.SstFileWriter\
 	org.rocksdb.Statistics\
-	org.rocksdb.Transaction\
-	org.rocksdb.TransactionDB\
-	org.rocksdb.TransactionDBOptions\
-	org.rocksdb.TransactionOptions\
 	org.rocksdb.TransactionLogIterator\
 	org.rocksdb.TtlDB\
 	org.rocksdb.VectorMemTableConfig\
@@ -65,7 +57,6 @@ NATIVE_JAVA_CLASSES = org.rocksdb.AbstractCompactionFilter\
 	org.rocksdb.WBWIRocksIterator
 
 NATIVE_JAVA_TEST_CLASSES = org.rocksdb.RocksDBExceptionTest\
-    org.rocksdb.NativeComparatorWrapperTest.NativeStringComparatorWrapper\
     org.rocksdb.WriteBatchTest\
     org.rocksdb.WriteBatchTestInternalHelper
 
@@ -113,11 +104,7 @@ JAVA_TESTS = org.rocksdb.BackupableDBOptionsTest\
 	org.rocksdb.MergeTest\
 	org.rocksdb.MixedOptionsTest\
 	org.rocksdb.MutableColumnFamilyOptionsTest\
-	org.rocksdb.NativeComparatorWrapperTest\
 	org.rocksdb.NativeLibraryLoaderTest\
-	org.rocksdb.OptimisticTransactionTest\
-	org.rocksdb.OptimisticTransactionDBTest\
-	org.rocksdb.OptimisticTransactionOptionsTest\
 	org.rocksdb.OptionsUtilTest\
 	org.rocksdb.OptionsTest\
 	org.rocksdb.PlainTableConfigTest\
@@ -133,10 +120,6 @@ JAVA_TESTS = org.rocksdb.BackupableDBOptionsTest\
 	org.rocksdb.SliceTest\
 	org.rocksdb.SnapshotTest\
 	org.rocksdb.SstFileWriterTest\
-	org.rocksdb.TransactionTest\
-	org.rocksdb.TransactionDBTest\
-	org.rocksdb.TransactionOptionsTest\
-	org.rocksdb.TransactionDBOptionsTest\
 	org.rocksdb.TransactionLogIteratorTest\
 	org.rocksdb.TtlDBTest\
 	org.rocksdb.StatisticsTest\
@@ -226,20 +209,6 @@ column_family_sample: java
 	java $(JAVA_ARGS) -Djava.library.path=target -cp $(MAIN_CLASSES):$(SAMPLES_MAIN_CLASSES) RocksDBColumnFamilySample /tmp/rocksdbjni
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 
-transaction_sample: java
-	$(AM_V_GEN)mkdir -p $(SAMPLES_MAIN_CLASSES)
-	$(AM_V_at)javac -cp $(MAIN_CLASSES) -d $(SAMPLES_MAIN_CLASSES) $(SAMPLES_MAIN_SRC)/TransactionSample.java
-	$(AM_V_at)@rm -rf /tmp/rocksdbjni
-	java -ea -Xcheck:jni -Djava.library.path=target -cp $(MAIN_CLASSES):$(SAMPLES_MAIN_CLASSES) TransactionSample /tmp/rocksdbjni
-	$(AM_V_at)@rm -rf /tmp/rocksdbjni
-
-optimistic_transaction_sample: java
-	$(AM_V_GEN)mkdir -p $(SAMPLES_MAIN_CLASSES)
-	$(AM_V_at)javac -cp $(MAIN_CLASSES) -d $(SAMPLES_MAIN_CLASSES) $(SAMPLES_MAIN_SRC)/OptimisticTransactionSample.java
-	$(AM_V_at)@rm -rf /tmp/rocksdbjni
-	java -ea -Xcheck:jni -Djava.library.path=target -cp $(MAIN_CLASSES):$(SAMPLES_MAIN_CLASSES) OptimisticTransactionSample /tmp/rocksdbjni
-	$(AM_V_at)@rm -rf /tmp/rocksdbjni
-
 resolve_test_deps:
 	test -d "$(JAVA_TEST_LIBDIR)" || mkdir -p "$(JAVA_TEST_LIBDIR)"
 	test -s "$(JAVA_JUNIT_JAR)" || cp $(MVN_LOCAL)/junit/junit/4.12/junit-4.12.jar $(JAVA_TEST_LIBDIR) || curl -k -L -o $(JAVA_JUNIT_JAR) $(SEARCH_REPO_URL)junit/junit/4.12/junit-4.12.jar

java/rocksjni/columnfamilyhandle.cc

@@ -3,8 +3,8 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-// This file implements the "bridge" between Java and C++ for
-// rocksdb::ColumnFamilyHandle.
+// This file implements the "bridge" between Java and C++ and enables
+// calling c++ rocksdb::Iterator methods from Java side.
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,56 +13,14 @@
 #include "include/org_rocksdb_ColumnFamilyHandle.h"
 #include "rocksjni/portal.h"
 
-/*
- * Class:     org_rocksdb_ColumnFamilyHandle
- * Method:    getName
- * Signature: (J)[B
- */
-jbyteArray Java_org_rocksdb_ColumnFamilyHandle_getName(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* cfh = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jhandle);
-  std::string cf_name = cfh->GetName();
-  return rocksdb::JniUtil::copyBytes(env, cf_name);
-}
-
-/*
-* Class:     org_rocksdb_ColumnFamilyHandle
-* Method:    getID
-* Signature: (J)I
-*/
-jint Java_org_rocksdb_ColumnFamilyHandle_getID(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* cfh = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jhandle);
-  const int32_t id = cfh->GetID();
-  return static_cast<jint>(id);
-}
-
-/*
- * Class:     org_rocksdb_ColumnFamilyHandle
- * Method:    getDescriptor
- * Signature: (J)Lorg/rocksdb/ColumnFamilyDescriptor;
- */
-jobject Java_org_rocksdb_ColumnFamilyHandle_getDescriptor(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* cfh = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jhandle);
-  rocksdb::ColumnFamilyDescriptor desc;
-  rocksdb::Status s = cfh->GetDescriptor(&desc);
-  if (s.ok()) {
-    return rocksdb::ColumnFamilyDescriptorJni::construct(env, &desc);
-  } else {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-    return nullptr;
-  }
-}
-
 /*
  * Class:     org_rocksdb_ColumnFamilyHandle
  * Method:    disposeInternal
  * Signature: (J)V
  */
 void Java_org_rocksdb_ColumnFamilyHandle_disposeInternal(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* cfh = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jhandle);
+    JNIEnv* env, jobject jobj, jlong handle) {
+  auto* cfh = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(handle);
   assert(cfh != nullptr);
   delete cfh;
 }

java/rocksjni/comparator.cc

@@ -14,7 +14,6 @@
 
 #include "include/org_rocksdb_Comparator.h"
 #include "include/org_rocksdb_DirectComparator.h"
-#include "include/org_rocksdb_NativeComparatorWrapper.h"
 #include "rocksjni/comparatorjnicallback.h"
 #include "rocksjni/portal.h"
 
@@ -50,16 +49,4 @@ jlong Java_org_rocksdb_DirectComparator_createNewDirectComparator0(
       new rocksdb::DirectComparatorJniCallback(env, jobj, copt);
   return reinterpret_cast<jlong>(c);
 }
-
-/*
- * Class:     org_rocksdb_NativeComparatorWrapper
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_NativeComparatorWrapper_disposeInternal(
-    JNIEnv* env, jobject jobj, jlong jcomparator_handle) {
-  auto* comparator =
-      reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
-  delete comparator;
-}
 // </editor-fold>

java/rocksjni/native_comparator_wrapper_test.cc

@@ -1,50 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#include <jni.h>
-#include <string>
-
-#include "rocksdb/comparator.h"
-#include "rocksdb/slice.h"
-
-#include "include/org_rocksdb_NativeComparatorWrapperTest_NativeStringComparatorWrapper.h"
-
-namespace rocksdb {
-
-class NativeComparatorWrapperTestStringComparator
-    : public Comparator {
-
-  const char* Name() const {
-    return "NativeComparatorWrapperTestStringComparator";
-  }
-
-  int Compare(
-      const Slice& a, const Slice& b) const {
-    return a.ToString().compare(b.ToString());
-  }
-
-  void FindShortestSeparator(
-      std::string* start, const Slice& limit) const {
-    return;
-  }
-
-  void FindShortSuccessor(
-      std::string* key) const {
-    return;
-  }
-};
-}  // end of rocksdb namespace
-
-/*
- * Class:     org_rocksdb_NativeComparatorWrapperTest_NativeStringComparatorWrapper
- * Method:    newStringComparator
- * Signature: ()J
- */
-jlong Java_org_rocksdb_NativeComparatorWrapperTest_00024NativeStringComparatorWrapper_newStringComparator(
-    JNIEnv* env , jobject jobj) {
-  auto* comparator =
-      new rocksdb::NativeComparatorWrapperTestStringComparator();
-  return reinterpret_cast<jlong>(comparator);
-}

java/rocksjni/optimistic_transaction_db.cc

@@ -1,267 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the "bridge" between Java and C++
-// for rocksdb::TransactionDB.
-
-#include <jni.h>
-
-#include "include/org_rocksdb_OptimisticTransactionDB.h"
-
-#include "rocksdb/options.h"
-#include "rocksdb/utilities/optimistic_transaction_db.h"
-#include "rocksdb/utilities/transaction.h"
-
-#include "rocksjni/portal.h"
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    open
- * Signature: (JLjava/lang/String;)J
- */
-jlong Java_org_rocksdb_OptimisticTransactionDB_open__JLjava_lang_String_2(
-    JNIEnv* env, jclass jcls, jlong joptions_handle, jstring jdb_path) {
-  const char* db_path = env->GetStringUTFChars(jdb_path, nullptr);
-  if (db_path == nullptr) {
-      // exception thrown: OutOfMemoryError
-      return 0;
-  }
-
-  auto* options = reinterpret_cast<rocksdb::Options*>(joptions_handle);
-  rocksdb::OptimisticTransactionDB* otdb = nullptr;
-  rocksdb::Status s =
-      rocksdb::OptimisticTransactionDB::Open(*options, db_path, &otdb);
-  env->ReleaseStringUTFChars(jdb_path, db_path);
-
-  if (s.ok()) {
-    return reinterpret_cast<jlong>(otdb);
-  } else {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-    return 0;
-  }
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    open
- * Signature: (JLjava/lang/String;[[B[J)[J
- */
-jlongArray Java_org_rocksdb_OptimisticTransactionDB_open__JLjava_lang_String_2_3_3B_3J(
-    JNIEnv* env, jclass jcls, jlong jdb_options_handle, jstring jdb_path,
-    jobjectArray jcolumn_names, jlongArray jcolumn_options_handles) {
-  const char* db_path = env->GetStringUTFChars(jdb_path, nullptr);
-  if (db_path == nullptr) {
-      // exception thrown: OutOfMemoryError
-      return nullptr;
-  }
-
-  std::vector<rocksdb::ColumnFamilyDescriptor> column_families;
-  const jsize len_cols = env->GetArrayLength(jcolumn_names);
-  if (len_cols > 0) {
-    if (env->EnsureLocalCapacity(len_cols) != 0) {
-      // out of memory
-      env->ReleaseStringUTFChars(jdb_path, db_path);
-      return nullptr;
-    }
-
-    jlong* jco =
-        env->GetLongArrayElements(jcolumn_options_handles, nullptr);
-    if(jco == nullptr) {
-        // exception thrown: OutOfMemoryError
-        env->ReleaseStringUTFChars(jdb_path, db_path);
-        return nullptr;
-    }
-
-    for (int i = 0; i < len_cols; i++) {
-        const jobject jcn = env->GetObjectArrayElement(jcolumn_names, i);
-        if (env->ExceptionCheck()) {
-            // exception thrown: ArrayIndexOutOfBoundsException
-            env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-            env->ReleaseStringUTFChars(jdb_path, db_path);
-            return nullptr;
-        }
-
-        const jbyteArray jcn_ba = reinterpret_cast<jbyteArray>(jcn);
-        const jsize jcf_name_len = env->GetArrayLength(jcn_ba);
-        if (env->EnsureLocalCapacity(jcf_name_len) != 0) {
-          // out of memory
-          env->DeleteLocalRef(jcn);
-          env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-          env->ReleaseStringUTFChars(jdb_path, db_path);
-          return nullptr;
-        }
-
-        jbyte* jcf_name = env->GetByteArrayElements(jcn_ba, nullptr);
-        if (jcf_name == nullptr) {
-            // exception thrown: OutOfMemoryError
-            env->DeleteLocalRef(jcn);
-            env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-            env->ReleaseStringUTFChars(jdb_path, db_path);
-            return nullptr;
-        }
-
-        const std::string cf_name(reinterpret_cast<char *>(jcf_name), jcf_name_len);
-        const rocksdb::ColumnFamilyOptions* cf_options =
-            reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jco[i]);
-        column_families.push_back(
-            rocksdb::ColumnFamilyDescriptor(cf_name, *cf_options));
-
-        env->ReleaseByteArrayElements(jcn_ba, jcf_name, JNI_ABORT);
-        env->DeleteLocalRef(jcn);
-    }
-    env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-  }
-
-  auto* db_options = reinterpret_cast<rocksdb::DBOptions*>(jdb_options_handle);
-  std::vector<rocksdb::ColumnFamilyHandle*> handles;
-  rocksdb::OptimisticTransactionDB* otdb = nullptr;
-  const rocksdb::Status s = rocksdb::OptimisticTransactionDB::Open(*db_options,
-      db_path, column_families, &handles, &otdb);
-
-  env->ReleaseStringUTFChars(jdb_path, db_path);
-
-  // check if open operation was successful
-  if (s.ok()) {
-    const jsize resultsLen = 1 + len_cols;  // db handle + column family handles
-    std::unique_ptr<jlong[]> results =
-        std::unique_ptr<jlong[]>(new jlong[resultsLen]);
-    results[0] = reinterpret_cast<jlong>(otdb);
-    for (int i = 1; i <= len_cols; i++) {
-      results[i] = reinterpret_cast<jlong>(handles[i - 1]);
-    }
-
-    jlongArray jresults = env->NewLongArray(resultsLen);
-    if (jresults == nullptr) {
-        // exception thrown: OutOfMemoryError
-        return nullptr;
-    }
-    env->SetLongArrayRegion(jresults, 0, resultsLen, results.get());
-    if (env->ExceptionCheck()) {
-        // exception thrown: ArrayIndexOutOfBoundsException
-        return nullptr;
-    }
-    return jresults;
-  }
-
-  rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-  return nullptr;
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    beginTransaction
- * Signature: (JJ)J
- */
-jlong Java_org_rocksdb_OptimisticTransactionDB_beginTransaction__JJ(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_options_handle) {
-  auto* optimistic_txn_db =
-      reinterpret_cast<rocksdb::OptimisticTransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  rocksdb::Transaction* txn =
-      optimistic_txn_db->BeginTransaction(*write_options);
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    beginTransaction
- * Signature: (JJJ)J
- */
-jlong Java_org_rocksdb_OptimisticTransactionDB_beginTransaction__JJJ(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_options_handle,
-    jlong joptimistic_txn_options_handle) {
-  auto* optimistic_txn_db =
-      reinterpret_cast<rocksdb::OptimisticTransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  auto* optimistic_txn_options =
-      reinterpret_cast<rocksdb::OptimisticTransactionOptions*>(
-      joptimistic_txn_options_handle);
-  rocksdb::Transaction* txn =
-      optimistic_txn_db->BeginTransaction(*write_options,
-      *optimistic_txn_options);
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    beginTransaction_withOld
- * Signature: (JJJ)J
- */
-jlong Java_org_rocksdb_OptimisticTransactionDB_beginTransaction_1withOld__JJJ(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_options_handle,
-    jlong jold_txn_handle) {
-  auto* optimistic_txn_db =
-      reinterpret_cast<rocksdb::OptimisticTransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  auto* old_txn =
-      reinterpret_cast<rocksdb::Transaction*>(
-      jold_txn_handle);
-  rocksdb::OptimisticTransactionOptions optimistic_txn_options;
-  rocksdb::Transaction* txn =
-      optimistic_txn_db->BeginTransaction(*write_options,
-          optimistic_txn_options, old_txn);
-
-  // RocksJava relies on the assumption that
-  // we do not allocate a new Transaction object
-  // when providing an old_optimistic_txn
-  assert(txn == old_txn);
-
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    beginTransaction_withOld
- * Signature: (JJJJ)J
- */
-jlong Java_org_rocksdb_OptimisticTransactionDB_beginTransaction_1withOld__JJJJ(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_options_handle,
-    jlong joptimistic_txn_options_handle, jlong jold_txn_handle) {
-  auto* optimistic_txn_db =
-      reinterpret_cast<rocksdb::OptimisticTransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  auto* optimistic_txn_options =
-      reinterpret_cast<rocksdb::OptimisticTransactionOptions*>(
-        joptimistic_txn_options_handle);
-  auto* old_txn =
-      reinterpret_cast<rocksdb::Transaction*>(
-      jold_txn_handle);
-  rocksdb::Transaction* txn =
-      optimistic_txn_db->BeginTransaction(*write_options,
-      *optimistic_txn_options, old_txn);
-
-  // RocksJava relies on the assumption that
-  // we do not allocate a new Transaction object
-  // when providing an old_optimisic_txn
-  assert(txn == old_txn);
-
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    getBaseDB
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_OptimisticTransactionDB_getBaseDB(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* optimistic_txn_db =
-      reinterpret_cast<rocksdb::OptimisticTransactionDB*>(jhandle);
-  return reinterpret_cast<jlong>(optimistic_txn_db->GetBaseDB());
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionDB
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_OptimisticTransactionDB_disposeInternal(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  delete reinterpret_cast<rocksdb::OptimisticTransactionDB*>(jhandle);
-}

java/rocksjni/optimistic_transaction_options.cc

@@ -1,72 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the "bridge" between Java and C++
-// for rocksdb::OptimisticTransactionOptions.
-
-#include <jni.h>
-
-#include "include/org_rocksdb_OptimisticTransactionOptions.h"
-
-#include "rocksdb/comparator.h"
-#include "rocksdb/utilities/optimistic_transaction_db.h"
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionOptions
- * Method:    newOptimisticTransactionOptions
- * Signature: ()J
- */
-jlong Java_org_rocksdb_OptimisticTransactionOptions_newOptimisticTransactionOptions(
-    JNIEnv* env, jclass jcls) {
-  rocksdb::OptimisticTransactionOptions* opts =
-      new rocksdb::OptimisticTransactionOptions();
-  return reinterpret_cast<jlong>(opts);
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionOptions
- * Method:    isSetSnapshot
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_OptimisticTransactionOptions_isSetSnapshot(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts =
-      reinterpret_cast<rocksdb::OptimisticTransactionOptions*>(jhandle);
-  return opts->set_snapshot;
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionOptions
- * Method:    setSetSnapshot
- * Signature: (JZ)V
- */
-void Java_org_rocksdb_OptimisticTransactionOptions_setSetSnapshot(JNIEnv* env,
-    jobject jobj, jlong jhandle, jboolean jset_snapshot) {
-  auto* opts =
-      reinterpret_cast<rocksdb::OptimisticTransactionOptions*>(jhandle);
-  opts->set_snapshot = jset_snapshot;
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionOptions
- * Method:    setComparator
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_OptimisticTransactionOptions_setComparator(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jcomparator_handle) {
-  auto* opts =
-      reinterpret_cast<rocksdb::OptimisticTransactionOptions*>(jhandle);
-  opts->cmp = reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
-}
-
-/*
- * Class:     org_rocksdb_OptimisticTransactionOptions
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_OptimisticTransactionOptions_disposeInternal(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  delete reinterpret_cast<rocksdb::OptimisticTransactionOptions*>(jhandle);
-}

java/rocksjni/options.cc

@@ -146,33 +146,19 @@ void Java_org_rocksdb_Options_setComparatorHandle__JI(
 /*
  * Class:     org_rocksdb_Options
  * Method:    setComparatorHandle
- * Signature: (JJB)V
+ * Signature: (JJZ)V
  */
-void Java_org_rocksdb_Options_setComparatorHandle__JJB(
+void Java_org_rocksdb_Options_setComparatorHandle__JJZ(
     JNIEnv* env, jobject jobj, jlong jopt_handle, jlong jcomparator_handle,
-    jbyte jcomparator_type) {
-  rocksdb::Comparator *comparator = nullptr;
-  switch(jcomparator_type) {
-      // JAVA_COMPARATOR
-      case 0x0:
-        comparator =
-            reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
-        break;
-
-      // JAVA_DIRECT_COMPARATOR
-      case 0x1:
-        comparator =
-            reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jcomparator_handle);
-        break;
-
-      // JAVA_NATIVE_COMPARATOR_WRAPPER
-      case 0x2:
-        comparator =
-            reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
-        break;
-  }
+    jboolean is_direct) {
   auto* opt = reinterpret_cast<rocksdb::Options*>(jopt_handle);
-  opt->comparator = comparator;
+  if(is_direct) {
+    opt->comparator =
+        reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jcomparator_handle);
+  } else {
+    opt->comparator =
+        reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
+  }
 }
 
 /*
@@ -2974,33 +2960,19 @@ void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JI(
 /*
  * Class:     org_rocksdb_ColumnFamilyOptions
  * Method:    setComparatorHandle
- * Signature: (JJB)V
+ * Signature: (JJZ)V
  */
-void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JJB(
+void Java_org_rocksdb_ColumnFamilyOptions_setComparatorHandle__JJZ(
     JNIEnv* env, jobject jobj, jlong jopt_handle, jlong jcomparator_handle,
-    jbyte jcomparator_type) {
-  rocksdb::Comparator *comparator = nullptr;
-  switch(jcomparator_type) {
-      // JAVA_COMPARATOR
-      case 0x0:
-        comparator =
-            reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
-        break;
-
-      // JAVA_DIRECT_COMPARATOR
-      case 0x1:
-        comparator =
-            reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jcomparator_handle);
-        break;
-
-      // JAVA_NATIVE_COMPARATOR_WRAPPER
-      case 0x2:
-        comparator =
-            reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
-        break;
-  }
+    jboolean is_direct) {
   auto* opt = reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jopt_handle);
-  opt->comparator = comparator;
+  if(is_direct) {
+    opt->comparator =
+        reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jcomparator_handle);
+  } else {
+    opt->comparator =
+        reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
+  }
 }
 
 /*

java/rocksjni/ratelimiterjni.cc

@@ -12,21 +12,16 @@
 /*
  * Class:     org_rocksdb_RateLimiter
  * Method:    newRateLimiterHandle
- * Signature: (JJIBZ)J
+ * Signature: (JJI)J
  */
 jlong Java_org_rocksdb_RateLimiter_newRateLimiterHandle(
     JNIEnv* env, jclass jclazz, jlong jrate_bytes_per_second,
-    jlong jrefill_period_micros, jint jfairness, jbyte jrate_limiter_mode,
-    jboolean jauto_tune) {
-  auto rate_limiter_mode = rocksdb::RateLimiterModeJni::toCppRateLimiterMode(
-      jrate_limiter_mode);
+    jlong jrefill_period_micros, jint jfairness) {
   auto * sptr_rate_limiter =
       new std::shared_ptr<rocksdb::RateLimiter>(rocksdb::NewGenericRateLimiter(
           static_cast<int64_t>(jrate_bytes_per_second),
           static_cast<int64_t>(jrefill_period_micros),
-          static_cast<int32_t>(jfairness),
-          rate_limiter_mode,
-          jauto_tune));
+          static_cast<int32_t>(jfairness)));
 
   return reinterpret_cast<jlong>(sptr_rate_limiter);
 }
@@ -55,17 +50,6 @@ void Java_org_rocksdb_RateLimiter_setBytesPerSecond(
       SetBytesPerSecond(jbytes_per_second);
 }
 
-/*
- * Class:     org_rocksdb_RateLimiter
- * Method:    getBytesPerSecond
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_RateLimiter_getBytesPerSecond(
-    JNIEnv* env, jobject jobj, jlong handle) {
-  return reinterpret_cast<std::shared_ptr<rocksdb::RateLimiter> *>(handle)->get()->
-      GetBytesPerSecond();
-}
-
 /*
  * Class:     org_rocksdb_RateLimiter
  * Method:    request

java/rocksjni/sst_file_writerjni.cc

@@ -20,34 +20,24 @@
 /*
  * Class:     org_rocksdb_SstFileWriter
  * Method:    newSstFileWriter
- * Signature: (JJJB)J
+ * Signature: (JJJZ)J
  */
-jlong Java_org_rocksdb_SstFileWriter_newSstFileWriter__JJJB(JNIEnv *env,
-    jclass jcls, jlong jenvoptions,  jlong joptions, jlong jcomparator_handle,
-    jbyte jcomparator_type) {
-  rocksdb::Comparator *comparator = nullptr;
-  switch(jcomparator_type) {
-      // JAVA_COMPARATOR
-      case 0x0:
-        comparator =
-            reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator_handle);
-        break;
-
-      // JAVA_DIRECT_COMPARATOR
-      case 0x1:
-        comparator =
-            reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jcomparator_handle);
-        break;
-
-      // JAVA_NATIVE_COMPARATOR_WRAPPER
-      case 0x2:
-        comparator =
-            reinterpret_cast<rocksdb::Comparator*>(jcomparator_handle);
-        break;
-  }
+jlong Java_org_rocksdb_SstFileWriter_newSstFileWriter__JJJZ(JNIEnv *env,
+    jclass jcls, jlong jenvoptions,  jlong joptions, jlong jcomparator,
+    jboolean is_direct) {
   auto *env_options =
       reinterpret_cast<const rocksdb::EnvOptions *>(jenvoptions);
   auto *options = reinterpret_cast<const rocksdb::Options *>(joptions);
+
+  rocksdb::Comparator *comparator = nullptr;
+  if(is_direct) {
+    comparator =
+        reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jcomparator);
+  } else {
+    comparator =
+        reinterpret_cast<rocksdb::ComparatorJniCallback*>(jcomparator);
+  }
+
   rocksdb::SstFileWriter *sst_file_writer =
       new rocksdb::SstFileWriter(*env_options, *options, comparator);
   return reinterpret_cast<jlong>(sst_file_writer);

java/rocksjni/transaction_db.cc

@@ -1,431 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the "bridge" between Java and C++
-// for rocksdb::TransactionDB.
-
-#include <jni.h>
-#include <functional>
-#include <memory>
-#include <utility>
-
-
-#include "include/org_rocksdb_TransactionDB.h"
-
-#include "rocksdb/options.h"
-#include "rocksdb/utilities/transaction.h"
-#include "rocksdb/utilities/transaction_db.h"
-
-#include "rocksjni/portal.h"
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    open
- * Signature: (JJLjava/lang/String;)J
- */
-jlong Java_org_rocksdb_TransactionDB_open__JJLjava_lang_String_2(JNIEnv* env,
-    jclass jcls, jlong joptions_handle, jlong jtxn_db_options_handle,
-    jstring jdb_path) {
-  auto* options = reinterpret_cast<rocksdb::Options*>(joptions_handle);
-  auto* txn_db_options =
-      reinterpret_cast<rocksdb::TransactionDBOptions*>(jtxn_db_options_handle);
-  rocksdb::TransactionDB* tdb = nullptr;
-  const char* db_path = env->GetStringUTFChars(jdb_path, nullptr);
-  if (db_path == nullptr) {
-    // exception thrown: OutOfMemoryError
-    return 0;
-  }
-  rocksdb::Status s =
-      rocksdb::TransactionDB::Open(*options, *txn_db_options, db_path, &tdb);
-  env->ReleaseStringUTFChars(jdb_path, db_path);
-
-  if (s.ok()) {
-    return reinterpret_cast<jlong>(tdb);
-  } else {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-    return 0;
-  }
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    open
- * Signature: (JJLjava/lang/String;[[B[J)[J
- */
-jlongArray Java_org_rocksdb_TransactionDB_open__JJLjava_lang_String_2_3_3B_3J(
-    JNIEnv* env, jclass jcls, jlong jdb_options_handle,
-    jlong jtxn_db_options_handle, jstring jdb_path,
-    jobjectArray jcolumn_names,
-    jlongArray jcolumn_options_handles) {
-  const char* db_path = env->GetStringUTFChars(jdb_path, nullptr);
-  if (db_path == nullptr) {
-    // exception thrown: OutOfMemoryError
-    return nullptr;
-  }
-
-  const jsize len_cols = env->GetArrayLength(jcolumn_names);
-  if (env->EnsureLocalCapacity(len_cols) != 0) {
-    // out of memory
-    env->ReleaseStringUTFChars(jdb_path, db_path);
-    return nullptr;
-  }
-
-  jlong* jco = env->GetLongArrayElements(jcolumn_options_handles, nullptr);
-  if (jco == nullptr) {
-      // exception thrown: OutOfMemoryError
-      env->ReleaseStringUTFChars(jdb_path, db_path);
-      return nullptr;
-  }
-  std::vector<rocksdb::ColumnFamilyDescriptor> column_families;
-  for (int i = 0; i < len_cols; i++) {
-    const jobject jcn = env->GetObjectArrayElement(jcolumn_names, i);
-    if (env->ExceptionCheck()) {
-        // exception thrown: ArrayIndexOutOfBoundsException
-        env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-        env->ReleaseStringUTFChars(jdb_path, db_path);
-        return nullptr;
-    }
-    const jbyteArray jcn_ba = reinterpret_cast<jbyteArray>(jcn);
-    jbyte* jcf_name = env->GetByteArrayElements(jcn_ba, nullptr);
-    if (jcf_name == nullptr) {
-      // exception thrown: OutOfMemoryError
-      env->DeleteLocalRef(jcn);
-      env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-      env->ReleaseStringUTFChars(jdb_path, db_path);
-      return nullptr;
-    }
-
-    const int jcf_name_len = env->GetArrayLength(jcn_ba);
-    if (env->EnsureLocalCapacity(jcf_name_len) != 0) {
-        // out of memory
-        env->ReleaseByteArrayElements(jcn_ba, jcf_name, JNI_ABORT);
-        env->DeleteLocalRef(jcn);
-        env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-        env->ReleaseStringUTFChars(jdb_path, db_path);
-        return nullptr;
-    }
-    const std::string cf_name(reinterpret_cast<char *>(jcf_name), jcf_name_len);
-    const rocksdb::ColumnFamilyOptions* cf_options =
-      reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jco[i]);
-    column_families.push_back(
-      rocksdb::ColumnFamilyDescriptor(cf_name, *cf_options));
-
-    env->ReleaseByteArrayElements(jcn_ba, jcf_name, JNI_ABORT);
-    env->DeleteLocalRef(jcn);
-  }
-  env->ReleaseLongArrayElements(jcolumn_options_handles, jco, JNI_ABORT);
-
-  auto* db_options = reinterpret_cast<rocksdb::DBOptions*>(jdb_options_handle);
-  auto* txn_db_options =
-      reinterpret_cast<rocksdb::TransactionDBOptions*>(jtxn_db_options_handle);
-  std::vector<rocksdb::ColumnFamilyHandle*> handles;
-  rocksdb::TransactionDB* tdb = nullptr;
-  const rocksdb::Status s = rocksdb::TransactionDB::Open(*db_options, *txn_db_options,
-      db_path, column_families, &handles, &tdb);
-
-  // check if open operation was successful
-  if (s.ok()) {
-    const jsize resultsLen = 1 + len_cols;  // db handle + column family handles
-    std::unique_ptr<jlong[]> results =
-        std::unique_ptr<jlong[]>(new jlong[resultsLen]);
-    results[0] = reinterpret_cast<jlong>(tdb);
-    for (int i = 1; i <= len_cols; i++) {
-      results[i] = reinterpret_cast<jlong>(handles[i - 1]);
-    }
-
-    jlongArray jresults = env->NewLongArray(resultsLen);
-    if (jresults == nullptr) {
-        // exception thrown: OutOfMemoryError
-        return nullptr;
-    }
-    env->SetLongArrayRegion(jresults, 0, resultsLen, results.get());
-    if (env->ExceptionCheck()) {
-        // exception thrown: ArrayIndexOutOfBoundsException
-        env->DeleteLocalRef(jresults);
-        return nullptr;
-    }
-    return jresults;
-  } else {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-    return nullptr;
-  }
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    beginTransaction
- * Signature: (JJ)J
- */
-jlong Java_org_rocksdb_TransactionDB_beginTransaction__JJ(JNIEnv* env,
-    jobject jobj, jlong jhandle, jlong jwrite_options_handle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  rocksdb::Transaction* txn = txn_db->BeginTransaction(*write_options);
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    beginTransaction
- * Signature: (JJJ)J
- */
-jlong Java_org_rocksdb_TransactionDB_beginTransaction__JJJ(JNIEnv* env,
-    jobject jobj, jlong jhandle, jlong jwrite_options_handle,
-    jlong jtxn_options_handle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  auto* txn_options =
-      reinterpret_cast<rocksdb::TransactionOptions*>(jtxn_options_handle);
-  rocksdb::Transaction* txn =
-      txn_db->BeginTransaction(*write_options, *txn_options);
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    beginTransaction_withOld
- * Signature: (JJJ)J
- */
-jlong Java_org_rocksdb_TransactionDB_beginTransaction_1withOld__JJJ(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_options_handle,
-    jlong jold_txn_handle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  auto* old_txn = reinterpret_cast<rocksdb::Transaction*>(jold_txn_handle);
-  rocksdb::TransactionOptions txn_options;
-  rocksdb::Transaction* txn =
-      txn_db->BeginTransaction(*write_options, txn_options, old_txn);
-
-  // RocksJava relies on the assumption that
-  // we do not allocate a new Transaction object
-  // when providing an old_txn
-  assert(txn == old_txn);
-
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    beginTransaction_withOld
- * Signature: (JJJJ)J
- */
-jlong Java_org_rocksdb_TransactionDB_beginTransaction_1withOld__JJJJ(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_options_handle,
-    jlong jtxn_options_handle, jlong jold_txn_handle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  auto* write_options =
-      reinterpret_cast<rocksdb::WriteOptions*>(jwrite_options_handle);
-  auto* txn_options =
-      reinterpret_cast<rocksdb::TransactionOptions*>(jtxn_options_handle);
-  auto* old_txn = reinterpret_cast<rocksdb::Transaction*>(jold_txn_handle);
-  rocksdb::Transaction* txn = txn_db->BeginTransaction(*write_options,
-      *txn_options, old_txn);
-
-  // RocksJava relies on the assumption that
-  // we do not allocate a new Transaction object
-  // when providing an old_txn
-  assert(txn == old_txn);
-
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    getTransactionByName
- * Signature: (JLjava/lang/String;)J
- */
-jlong Java_org_rocksdb_TransactionDB_getTransactionByName(JNIEnv* env,
-    jobject jobj, jlong jhandle, jstring jname) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  const char* name = env->GetStringUTFChars(jname, nullptr);
-  if (name == nullptr) {
-      // exception thrown: OutOfMemoryError
-      return 0;
-  }
-  rocksdb::Transaction* txn = txn_db->GetTransactionByName(name);
-  env->ReleaseStringUTFChars(jname, name);
-  return reinterpret_cast<jlong>(txn);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    getAllPreparedTransactions
- * Signature: (J)[J
- */
-jlongArray Java_org_rocksdb_TransactionDB_getAllPreparedTransactions(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  std::vector<rocksdb::Transaction*> txns;
-  txn_db->GetAllPreparedTransactions(&txns);
-
-  const size_t size = txns.size();
-  assert(size < UINT32_MAX);  // does it fit in a jint?
-
-  const jsize len = static_cast<jsize>(size);
-  jlong tmp[len];
-  for (jsize i = 0; i < len; ++i) {
-      tmp[i] = reinterpret_cast<jlong>(txns[i]);
-  }
-
-  jlongArray jtxns = env->NewLongArray(len);
-  if (jtxns == nullptr) {
-      // exception thrown: OutOfMemoryError
-      return nullptr;
-  }
-  env->SetLongArrayRegion(jtxns, 0, len, tmp);
-  if (env->ExceptionCheck()) {
-      // exception thrown: ArrayIndexOutOfBoundsException
-      env->DeleteLocalRef(jtxns);
-      return nullptr;
-  }
-
-  return jtxns;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    getLockStatusData
- * Signature: (J)Ljava/util/Map;
- */
-jobject Java_org_rocksdb_TransactionDB_getLockStatusData(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  const std::unordered_multimap<uint32_t, rocksdb::KeyLockInfo> lock_status_data =
-      txn_db->GetLockStatusData();
-  const jobject jlock_status_data = rocksdb::HashMapJni::construct(env,
-        static_cast<uint32_t>(lock_status_data.size()));
-  if (jlock_status_data == nullptr) {
-      // exception occurred
-      return nullptr;
-  }
-
-  const rocksdb::HashMapJni::FnMapKV<const int32_t, const rocksdb::KeyLockInfo> fn_map_kv =
-      [env, txn_db, &lock_status_data](const std::pair<const int32_t, const rocksdb::KeyLockInfo>& pair) {
-          const jobject jlong_column_family_id =
-              rocksdb::LongJni::valueOf(env, pair.first);
-          if (jlong_column_family_id == nullptr) {
-              // an error occurred
-              return std::unique_ptr<std::pair<jobject, jobject>>(nullptr);
-          }
-          const jobject jkey_lock_info =
-              rocksdb::KeyLockInfoJni::construct(env, pair.second);
-          if (jkey_lock_info == nullptr) {
-             // an error occurred
-             return std::unique_ptr<std::pair<jobject, jobject>>(nullptr);
-          }
-          return std::unique_ptr<std::pair<jobject, jobject>>(new std::pair<jobject, jobject>(jlong_column_family_id,
-              jkey_lock_info));
-      };
-
-  if(!rocksdb::HashMapJni::putAll(env, jlock_status_data,
-      lock_status_data.begin(), lock_status_data.end(), fn_map_kv)) {
-    // exception occcurred
-    return nullptr;
-  }
-
-  return jlock_status_data;
-}
-
-/*
-* Class:     org_rocksdb_TransactionDB
-* Method:    getDeadlockInfoBuffer
-* Signature: (J)[Lorg/rocksdb/TransactionDB/DeadlockPath;
-*/
-jobjectArray Java_org_rocksdb_TransactionDB_getDeadlockInfoBuffer(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  const std::vector<rocksdb::DeadlockPath> deadlock_info_buffer =
-      txn_db->GetDeadlockInfoBuffer();
-
-  const jsize deadlock_info_buffer_len =
-      static_cast<jsize>(deadlock_info_buffer.size());
-  jobjectArray jdeadlock_info_buffer =
-      env->NewObjectArray(deadlock_info_buffer_len,
-        rocksdb::DeadlockPathJni::getJClass(env), nullptr);
-  if (jdeadlock_info_buffer == nullptr) {
-      // exception thrown: OutOfMemoryError
-      return nullptr;
-  }
-  jsize jdeadlock_info_buffer_offset = 0;
-
-  auto buf_end = deadlock_info_buffer.end();
-  for (auto buf_it = deadlock_info_buffer.begin(); buf_it != buf_end; ++buf_it) {
-    const rocksdb::DeadlockPath deadlock_path = *buf_it;
-    const std::vector<rocksdb::DeadlockInfo> deadlock_infos
-        = deadlock_path.path;
-    const jsize deadlock_infos_len =
-        static_cast<jsize>(deadlock_info_buffer.size());
-    jobjectArray jdeadlock_infos = env->NewObjectArray(deadlock_infos_len,
-        rocksdb::DeadlockInfoJni::getJClass(env), nullptr);
-    if (jdeadlock_infos == nullptr) {
-        // exception thrown: OutOfMemoryError
-        env->DeleteLocalRef(jdeadlock_info_buffer);
-        return nullptr;
-    }
-    jsize jdeadlock_infos_offset = 0;
-
-    auto infos_end = deadlock_infos.end();
-    for (auto infos_it = deadlock_infos.begin(); infos_it != infos_end; ++infos_it) {
-        const rocksdb::DeadlockInfo deadlock_info = *infos_it;
-        const jobject jdeadlock_info = rocksdb::TransactionDBJni::newDeadlockInfo(
-            env, jobj, deadlock_info.m_txn_id, deadlock_info.m_cf_id,
-            deadlock_info.m_waiting_key, deadlock_info.m_exclusive);
-        if (jdeadlock_info == nullptr) {
-            // exception occcurred
-            env->DeleteLocalRef(jdeadlock_info_buffer);
-            return nullptr;
-        }
-        env->SetObjectArrayElement(jdeadlock_infos, jdeadlock_infos_offset++, jdeadlock_info);
-        if (env->ExceptionCheck()) {
-            // exception thrown: ArrayIndexOutOfBoundsException or ArrayStoreException
-            env->DeleteLocalRef(jdeadlock_info);
-            env->DeleteLocalRef(jdeadlock_info_buffer);
-            return nullptr;
-        }
-    }
-
-    const jobject jdeadlock_path =
-        rocksdb::DeadlockPathJni::construct(env, jdeadlock_infos,
-            deadlock_path.limit_exceeded);
-    if(jdeadlock_path == nullptr) {
-        // exception occcurred
-        env->DeleteLocalRef(jdeadlock_info_buffer);
-        return nullptr;
-    }
-    env->SetObjectArrayElement(jdeadlock_info_buffer, jdeadlock_info_buffer_offset++, jdeadlock_path);
-    if (env->ExceptionCheck()) {
-        // exception thrown: ArrayIndexOutOfBoundsException or ArrayStoreException
-        env->DeleteLocalRef(jdeadlock_path);
-        env->DeleteLocalRef(jdeadlock_info_buffer);
-        return nullptr;
-    }
-  }
-
-  return jdeadlock_info_buffer;
-}
-
-/*
-* Class:     org_rocksdb_TransactionDB
-* Method:    setDeadlockInfoBufferSize
-* Signature: (JI)V
-*/
-void Java_org_rocksdb_TransactionDB_setDeadlockInfoBufferSize(
-    JNIEnv* env, jobject jobj, jlong jhandle, jint jdeadlock_info_buffer_size) {
-  auto* txn_db = reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-  txn_db->SetDeadlockInfoBufferSize(jdeadlock_info_buffer_size);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDB
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_TransactionDB_disposeInternal(JNIEnv* env, jobject jobj,
-    jlong jhandle) {
-  delete reinterpret_cast<rocksdb::TransactionDB*>(jhandle);
-}

java/rocksjni/transaction_db_options.cc

@@ -1,147 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the "bridge" between Java and C++
-// for rocksdb::TransactionDBOptions.
-
-#include <jni.h>
-
-#include "include/org_rocksdb_TransactionDBOptions.h"
-
-#include "rocksdb/utilities/transaction_db.h"
-
-#include "rocksjni/portal.h"
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    newTransactionDBOptions
- * Signature: ()J
- */
-jlong Java_org_rocksdb_TransactionDBOptions_newTransactionDBOptions(
-    JNIEnv* env, jclass jcls) {
-  rocksdb::TransactionDBOptions* opts = new rocksdb::TransactionDBOptions();
-  return reinterpret_cast<jlong>(opts);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    getMaxNumLocks
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionDBOptions_getMaxNumLocks(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  return opts->max_num_locks;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    setMaxNumLocks
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_TransactionDBOptions_setMaxNumLocks(JNIEnv* env,
-    jobject jobj, jlong jhandle, jlong jmax_num_locks) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  opts->max_num_locks = jmax_num_locks;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    getNumStripes
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionDBOptions_getNumStripes(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  return opts->num_stripes;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    setNumStripes
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_TransactionDBOptions_setNumStripes(JNIEnv* env,
-    jobject jobj, jlong jhandle, jlong jnum_stripes) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  opts->num_stripes = jnum_stripes;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    getTransactionLockTimeout
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionDBOptions_getTransactionLockTimeout(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  return opts->transaction_lock_timeout;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    setTransactionLockTimeout
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_TransactionDBOptions_setTransactionLockTimeout(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jtransaction_lock_timeout) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  opts->transaction_lock_timeout = jtransaction_lock_timeout;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    getDefaultLockTimeout
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionDBOptions_getDefaultLockTimeout(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  return opts->default_lock_timeout;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    setDefaultLockTimeout
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_TransactionDBOptions_setDefaultLockTimeout(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jdefault_lock_timeout) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  opts->default_lock_timeout = jdefault_lock_timeout;
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    getWritePolicy
- * Signature: (J)B
- */
-jbyte Java_org_rocksdb_TransactionDBOptions_getWritePolicy(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  return rocksdb::TxnDBWritePolicyJni::toJavaTxnDBWritePolicy(opts->write_policy);
-}
-
-/*
-* Class:     org_rocksdb_TransactionDBOptions
-* Method:    setWritePolicy
-* Signature: (JB)V
-*/
-void Java_org_rocksdb_TransactionDBOptions_setWritePolicy(
-    JNIEnv* env, jobject jobj, jlong jhandle, jbyte jwrite_policy) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-  opts->write_policy =
-      rocksdb::TxnDBWritePolicyJni::toCppTxnDBWritePolicy(jwrite_policy);
-}
-
-/*
- * Class:     org_rocksdb_TransactionDBOptions
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_TransactionDBOptions_disposeInternal(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  delete reinterpret_cast<rocksdb::TransactionDBOptions*>(jhandle);
-}

java/rocksjni/transaction_notifier.cc

@@ -1,42 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the "bridge" between Java and C++
-// for rocksdb::TransactionNotifier.
-
-#include <jni.h>
-
-#include "include/org_rocksdb_AbstractTransactionNotifier.h"
-#include "rocksjni/transaction_notifier_jnicallback.h"
-
-/*
- * Class:     org_rocksdb_AbstractTransactionNotifier
- * Method:    createNewTransactionNotifier
- * Signature: ()J
- */
-jlong Java_org_rocksdb_AbstractTransactionNotifier_createNewTransactionNotifier(
-    JNIEnv* env, jobject jobj) {
-  auto* transaction_notifier =
-      new rocksdb::TransactionNotifierJniCallback(env, jobj);
-  auto* sptr_transaction_notifier =
-      new std::shared_ptr<rocksdb::TransactionNotifierJniCallback>(
-          transaction_notifier);
-  return reinterpret_cast<jlong>(sptr_transaction_notifier);
-}
-
-/*
- * Class:     org_rocksdb_AbstractTransactionNotifier
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_AbstractTransactionNotifier_disposeInternal(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  // TODO(AR) refactor to use JniCallback::JniCallback
-  // when https://github.com/facebook/rocksdb/pull/1241/ is merged
-  std::shared_ptr<rocksdb::TransactionNotifierJniCallback>* handle =
-      reinterpret_cast<std::shared_ptr<
-          rocksdb::TransactionNotifierJniCallback>*>(jhandle);
-  delete handle;
-}

java/rocksjni/transaction_notifier_jnicallback.cc

@@ -1,39 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the callback "bridge" between Java and C++ for
-// rocksdb::TransactionNotifier.
-
-#include "rocksjni/transaction_notifier_jnicallback.h"
-#include "rocksjni/portal.h"
-
-namespace rocksdb {
-
-TransactionNotifierJniCallback::TransactionNotifierJniCallback(JNIEnv* env,
-    jobject jtransaction_notifier) : JniCallback(env, jtransaction_notifier) {
-  // we cache the method id for the JNI callback
-  m_jsnapshot_created_methodID =
-      AbstractTransactionNotifierJni::getSnapshotCreatedMethodId(env);
-}
-
-void TransactionNotifierJniCallback::SnapshotCreated(
-    const Snapshot* newSnapshot) {
-  jboolean attached_thread = JNI_FALSE;
-  JNIEnv* env = getJniEnv(&attached_thread);
-  assert(env != nullptr);
-
-  env->CallVoidMethod(m_jcallback_obj,
-      m_jsnapshot_created_methodID, reinterpret_cast<jlong>(newSnapshot));
-
-  if(env->ExceptionCheck()) {
-    // exception thrown from CallVoidMethod
-    env->ExceptionDescribe();  // print out exception to stderr
-    releaseJniEnv(attached_thread);
-    return;
-  }
-
-  releaseJniEnv(attached_thread);
-}
-}  // namespace rocksdb

java/rocksjni/transaction_notifier_jnicallback.h

@@ -1,42 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the callback "bridge" between Java and C++ for
-// rocksdb::TransactionNotifier.
-
-#ifndef JAVA_ROCKSJNI_TRANSACTION_NOTIFIER_JNICALLBACK_H_
-#define JAVA_ROCKSJNI_TRANSACTION_NOTIFIER_JNICALLBACK_H_
-
-#include <jni.h>
-
-#include "rocksdb/utilities/transaction.h"
-#include "rocksjni/jnicallback.h"
-
-namespace rocksdb {
-
-/**
- * This class acts as a bridge between C++
- * and Java. The methods in this class will be
- * called back from the RocksDB TransactionDB or OptimisticTransactionDB (C++),
- * we then callback to the appropriate Java method
- * this enables TransactionNotifier to be implemented in Java.
- *
- * Unlike RocksJava's Comparator JNI Callback, we do not attempt
- * to reduce Java object allocations by caching the Snapshot object
- * presented to the callback. This could be revisited in future
- * if performance is lacking.
- */
-class TransactionNotifierJniCallback: public JniCallback,
-    public TransactionNotifier {
- public:
-  TransactionNotifierJniCallback(JNIEnv* env, jobject jtransaction_notifier);
-  virtual void SnapshotCreated(const Snapshot* newSnapshot);
-
- private:
-  jmethodID m_jsnapshot_created_methodID;
-};
-}  // namespace rocksdb
-
-#endif  // JAVA_ROCKSJNI_TRANSACTION_NOTIFIER_JNICALLBACK_H_

java/rocksjni/transaction_options.cc

@@ -1,166 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-//
-// This file implements the "bridge" between Java and C++
-// for rocksdb::TransactionOptions.
-
-#include <jni.h>
-
-#include "include/org_rocksdb_TransactionOptions.h"
-
-#include "rocksdb/utilities/transaction_db.h"
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    newTransactionOptions
- * Signature: ()J
- */
-jlong Java_org_rocksdb_TransactionOptions_newTransactionOptions(JNIEnv* env,
-    jclass jcls) {
-  auto* opts = new rocksdb::TransactionOptions();
-  return reinterpret_cast<jlong>(opts);
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    isSetSnapshot
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_TransactionOptions_isSetSnapshot(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  return opts->set_snapshot;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    setSetSnapshot
- * Signature: (JZ)V
- */
-void Java_org_rocksdb_TransactionOptions_setSetSnapshot(JNIEnv* env,
-    jobject jobj, jlong jhandle, jboolean jset_snapshot) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  opts->set_snapshot = jset_snapshot;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    isDeadlockDetect
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_TransactionOptions_isDeadlockDetect(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  return opts->deadlock_detect;
-}
-
-/*
-* Class:     org_rocksdb_TransactionOptions
-* Method:    setDeadlockDetect
-* Signature: (JZ)V
-*/
-void Java_org_rocksdb_TransactionOptions_setDeadlockDetect(
-    JNIEnv* env, jobject jobj, jlong jhandle, jboolean jdeadlock_detect) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  opts->deadlock_detect = jdeadlock_detect;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    getLockTimeout
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionOptions_getLockTimeout(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  return opts->lock_timeout;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    setLockTimeout
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_TransactionOptions_setLockTimeout(JNIEnv* env,
-    jobject jobj, jlong jhandle, jlong jlock_timeout) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  opts->lock_timeout = jlock_timeout;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    getExpiration
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionOptions_getExpiration(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  return opts->expiration;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    setExpiration
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_TransactionOptions_setExpiration(JNIEnv* env,
-    jobject jobj, jlong jhandle, jlong jexpiration) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  opts->expiration = jexpiration;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    getDeadlockDetectDepth
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_TransactionOptions_getDeadlockDetectDepth(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  return opts->deadlock_detect_depth;
-}
-
-/*
-* Class:     org_rocksdb_TransactionOptions
-* Method:    setDeadlockDetectDepth
-* Signature: (JJ)V
-*/
-void Java_org_rocksdb_TransactionOptions_setDeadlockDetectDepth(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jdeadlock_detect_depth) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  opts->deadlock_detect_depth = jdeadlock_detect_depth;
-}
-
-/*
-* Class:     org_rocksdb_TransactionOptions
-* Method:    getMaxWriteBatchSize
-* Signature: (J)J
-*/
-jlong Java_org_rocksdb_TransactionOptions_getMaxWriteBatchSize(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  return opts->max_write_batch_size;
-}
-
-/*
-* Class:     org_rocksdb_TransactionOptions
-* Method:    setMaxWriteBatchSize
-* Signature: (JJ)V
-*/
-void Java_org_rocksdb_TransactionOptions_setMaxWriteBatchSize(
-    JNIEnv* env, jobject jobj, jlong jhandle, jlong jmax_write_batch_size) {
-  auto* opts = reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-  opts->max_write_batch_size = jmax_write_batch_size;
-}
-
-/*
- * Class:     org_rocksdb_TransactionOptions
- * Method:    disposeInternal
- * Signature: (J)V
- */
-void Java_org_rocksdb_TransactionOptions_disposeInternal(JNIEnv* env,
-    jobject jobj, jlong jhandle) {
-  delete reinterpret_cast<rocksdb::TransactionOptions*>(jhandle);
-}

java/rocksjni/write_batch.cc

@@ -27,34 +27,12 @@
  * Method:    newWriteBatch
  * Signature: (I)J
  */
-jlong Java_org_rocksdb_WriteBatch_newWriteBatch__I(
+jlong Java_org_rocksdb_WriteBatch_newWriteBatch(
     JNIEnv* env, jclass jcls, jint jreserved_bytes) {
   auto* wb = new rocksdb::WriteBatch(static_cast<size_t>(jreserved_bytes));
   return reinterpret_cast<jlong>(wb);
 }
 
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    newWriteBatch
- * Signature: ([BI)J
- */
-jlong Java_org_rocksdb_WriteBatch_newWriteBatch___3BI(
-    JNIEnv* env, jclass jcls, jbyteArray jserialized,
-    jint jserialized_length) {
-  jboolean has_exception = JNI_FALSE;
-  std::string serialized = rocksdb::JniUtil::byteString<std::string>(env,
-    jserialized, jserialized_length,
-    [](const char* str, const size_t len) { return std::string(str, len); },
-    &has_exception);
-  if(has_exception == JNI_TRUE) {
-    // exception occurred
-    return 0;
-  }
-
-  auto* wb = new rocksdb::WriteBatch(serialized);
-  return reinterpret_cast<jlong>(wb);
-}
-
 /*
  * Class:     org_rocksdb_WriteBatch
  * Method:    count0
@@ -112,37 +90,6 @@ void Java_org_rocksdb_WriteBatch_rollbackToSavePoint0(
   rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
 }
 
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    popSavePoint
- * Signature: (J)V
- */
-void Java_org_rocksdb_WriteBatch_popSavePoint(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  auto s = wb->PopSavePoint();
-
-  if (s.ok()) {
-    return;
-  }
-  rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    setMaxBytes
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_WriteBatch_setMaxBytes(
-    JNIEnv* env, jobject jobj, jlong jwb_handle, jlong jmax_bytes) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  wb->SetMaxBytes(static_cast<size_t>(jmax_bytes));
-}
-
 /*
  * Class:     org_rocksdb_WriteBatch
  * Method:    put
@@ -155,13 +102,10 @@ void Java_org_rocksdb_WriteBatch_put__J_3BI_3BI(
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
   assert(wb != nullptr);
   auto put = [&wb] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wb->Put(key, value);
+    wb->Put(key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(put, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(put, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
@@ -178,13 +122,10 @@ void Java_org_rocksdb_WriteBatch_put__J_3BI_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto put = [&wb, &cf_handle] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wb->Put(cf_handle, key, value);
+    wb->Put(cf_handle, key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(put, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(put, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
@@ -199,13 +140,10 @@ void Java_org_rocksdb_WriteBatch_merge__J_3BI_3BI(
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
   assert(wb != nullptr);
   auto merge = [&wb] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wb->Merge(key, value);
+    wb->Merge(key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(merge, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(merge, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
@@ -222,41 +160,34 @@ void Java_org_rocksdb_WriteBatch_merge__J_3BI_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto merge = [&wb, &cf_handle] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wb->Merge(cf_handle, key, value);
+    wb->Merge(cf_handle, key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(merge, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(merge, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
  * Class:     org_rocksdb_WriteBatch
- * Method:    delete
+ * Method:    remove
  * Signature: (J[BI)V
  */
-void Java_org_rocksdb_WriteBatch_delete__J_3BI(
+void Java_org_rocksdb_WriteBatch_remove__J_3BI(
     JNIEnv* env, jobject jobj, jlong jwb_handle,
     jbyteArray jkey, jint jkey_len) {
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
   assert(wb != nullptr);
   auto remove = [&wb] (rocksdb::Slice key) {
-    return wb->Delete(key);
+    wb->Delete(key);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(remove, env,
-      jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::k_op(remove, env, jobj, jkey, jkey_len);
 }
 
 /*
  * Class:     org_rocksdb_WriteBatch
- * Method:    delete
+ * Method:    remove
  * Signature: (J[BIJ)V
  */
-void Java_org_rocksdb_WriteBatch_delete__J_3BIJ(
+void Java_org_rocksdb_WriteBatch_remove__J_3BIJ(
     JNIEnv* env, jobject jobj, jlong jwb_handle,
     jbyteArray jkey, jint jkey_len, jlong jcf_handle) {
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
@@ -264,55 +195,9 @@ void Java_org_rocksdb_WriteBatch_delete__J_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto remove = [&wb, &cf_handle] (rocksdb::Slice key) {
-    return wb->Delete(cf_handle, key);
+    wb->Delete(cf_handle, key);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(remove, env,
-      jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    singleDelete
- * Signature: (J[BI)V
- */
-void Java_org_rocksdb_WriteBatch_singleDelete__J_3BI(
-    JNIEnv* env, jobject jobj, jlong jwb_handle, jbyteArray jkey,
-    jint jkey_len) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-  auto single_delete = [&wb] (rocksdb::Slice key) {
-    return wb->SingleDelete(key);
-  };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(single_delete,
-      env, jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    singleDelete
- * Signature: (J[BIJ)V
- */
-void Java_org_rocksdb_WriteBatch_singleDelete__J_3BIJ(
-    JNIEnv* env, jobject jobj, jlong jwb_handle, jbyteArray jkey,
-    jint jkey_len, jlong jcf_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-  auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
-  assert(cf_handle != nullptr);
-  auto single_delete = [&wb, &cf_handle] (rocksdb::Slice key) {
-    return wb->SingleDelete(cf_handle, key);
-  };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(single_delete,
-      env, jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::k_op(remove, env, jobj, jkey, jkey_len);
 }
 
 /*
@@ -320,20 +205,19 @@ void Java_org_rocksdb_WriteBatch_singleDelete__J_3BIJ(
  * Method:    deleteRange
  * Signature: (J[BI[BI)V
  */
+JNIEXPORT void JNICALL Java_org_rocksdb_WriteBatch_deleteRange__J_3BI_3BI(
+    JNIEnv*, jobject, jlong, jbyteArray, jint, jbyteArray, jint);
+
 void Java_org_rocksdb_WriteBatch_deleteRange__J_3BI_3BI(
     JNIEnv* env, jobject jobj, jlong jwb_handle, jbyteArray jbegin_key,
     jint jbegin_key_len, jbyteArray jend_key, jint jend_key_len) {
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
   assert(wb != nullptr);
   auto deleteRange = [&wb](rocksdb::Slice beginKey, rocksdb::Slice endKey) {
-    return wb->DeleteRange(beginKey, endKey);
+    wb->DeleteRange(beginKey, endKey);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(
-      deleteRange, env, jobj, jbegin_key, jbegin_key_len, jend_key,
-      jend_key_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(deleteRange, env, jobj, jbegin_key, jbegin_key_len,
+                          jend_key, jend_key_len);
 }
 
 /*
@@ -350,15 +234,11 @@ void Java_org_rocksdb_WriteBatch_deleteRange__J_3BI_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto deleteRange = [&wb, &cf_handle](rocksdb::Slice beginKey,
-      rocksdb::Slice endKey) {
-    return wb->DeleteRange(cf_handle, beginKey, endKey);
+                                       rocksdb::Slice endKey) {
+    wb->DeleteRange(cf_handle, beginKey, endKey);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(
-      deleteRange, env, jobj, jbegin_key, jbegin_key_len, jend_key,
-      jend_key_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(deleteRange, env, jobj, jbegin_key, jbegin_key_len,
+                          jend_key, jend_key_len);
 }
 
 /*
@@ -372,13 +252,9 @@ void Java_org_rocksdb_WriteBatch_putLogData(
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
   assert(wb != nullptr);
   auto putLogData = [&wb] (rocksdb::Slice blob) {
-    return wb->PutLogData(blob);
+    wb->PutLogData(blob);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(putLogData,
-      env, jobj, jblob, jblob_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::k_op(putLogData, env, jobj, jblob, jblob_len);
 }
 
 /*
@@ -387,7 +263,7 @@ void Java_org_rocksdb_WriteBatch_putLogData(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_WriteBatch_iterate(
-    JNIEnv* env, jobject jobj, jlong jwb_handle, jlong handlerHandle) {
+    JNIEnv* env , jobject jobj, jlong jwb_handle, jlong handlerHandle) {
   auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
   assert(wb != nullptr);
 
@@ -400,178 +276,6 @@ void Java_org_rocksdb_WriteBatch_iterate(
   rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
 }
 
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    data
- * Signature: (J)[B
- */
-jbyteArray Java_org_rocksdb_WriteBatch_data(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  auto data = wb->Data();
-  return rocksdb::JniUtil::copyBytes(env, data);
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    getDataSize
- * Signature: (J)J
- */
-jlong Java_org_rocksdb_WriteBatch_getDataSize(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  auto data_size = wb->GetDataSize();
-  return static_cast<jlong>(data_size);
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasPut
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_WriteBatch_hasPut(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasPut();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasDelete
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_WriteBatch_hasDelete(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasDelete();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasSingleDelete
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasSingleDelete(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasSingleDelete();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasDeleteRange
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasDeleteRange(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasDeleteRange();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasMerge
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasMerge(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasMerge();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasBeginPrepare
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasBeginPrepare(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasBeginPrepare();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasEndPrepare
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasEndPrepare(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasEndPrepare();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasCommit
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasCommit(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasCommit();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    hasRollback
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_rocksdb_WriteBatch_hasRollback(
-    JNIEnv* env , jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  return wb->HasRollback();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    markWalTerminationPoint
- * Signature: (J)V
- */
-void Java_org_rocksdb_WriteBatch_markWalTerminationPoint(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  wb->MarkWalTerminationPoint();
-}
-
-/*
- * Class:     org_rocksdb_WriteBatch
- * Method:    getWalTerminationPoint
- * Signature: (J)Lorg/rocksdb/WriteBatch/SavePoint;
- */
-jobject Java_org_rocksdb_WriteBatch_getWalTerminationPoint(
-    JNIEnv* env, jobject jobj, jlong jwb_handle) {
-  auto* wb = reinterpret_cast<rocksdb::WriteBatch*>(jwb_handle);
-  assert(wb != nullptr);
-
-  auto save_point = wb->GetWalTerminationPoint();
-  return rocksdb::WriteBatchSavePointJni::construct(env, save_point);
-}
-
 /*
  * Class:     org_rocksdb_WriteBatch
  * Method:    disposeInternal

java/rocksjni/write_batch_test.cc

@@ -87,32 +87,8 @@ jbyteArray Java_org_rocksdb_WriteBatchTest_getContents(
         state.append(")");
         count++;
         break;
-      case rocksdb::kTypeSingleDeletion:
-        state.append("SingleDelete(");
-        state.append(ikey.user_key.ToString());
-        state.append(")");
-        count++;
-        break;
-      case rocksdb::kTypeRangeDeletion:
-        state.append("DeleteRange(");
-        state.append(ikey.user_key.ToString());
-        state.append(", ");
-        state.append(iter->value().ToString());
-        state.append(")");
-        count++;
-        break;
-      case rocksdb::kTypeLogData:
-        state.append("LogData(");
-        state.append(ikey.user_key.ToString());
-        state.append(")");
-        count++;
-        break;
       default:
         assert(false);
-        state.append("Err:Expected(");
-        state.append(std::to_string(ikey.type));
-        state.append(")");
-        count++;
         break;
     }
     state.append("@");
@@ -120,12 +96,8 @@ jbyteArray Java_org_rocksdb_WriteBatchTest_getContents(
   }
   if (!s.ok()) {
     state.append(s.ToString());
-  } else if (rocksdb::WriteBatchInternal::Count(b) != count) {
-    state.append("Err:CountMismatch(expected=");
-    state.append(std::to_string(rocksdb::WriteBatchInternal::Count(b)));
-    state.append(", actual=");
-    state.append(std::to_string(count));
-    state.append(")");
+  } else if (count != rocksdb::WriteBatchInternal::Count(b)) {
+    state.append("CountMismatch()");
   }
   delete mem->Unref();
 

java/rocksjni/write_batch_with_index.cc

@@ -39,31 +39,19 @@ jlong Java_org_rocksdb_WriteBatchWithIndex_newWriteBatchWithIndex__Z(
 /*
  * Class:     org_rocksdb_WriteBatchWithIndex
  * Method:    newWriteBatchWithIndex
- * Signature: (JBIZ)J
+ * Signature: (JZIZ)J
  */
-jlong Java_org_rocksdb_WriteBatchWithIndex_newWriteBatchWithIndex__JBIZ(
+jlong Java_org_rocksdb_WriteBatchWithIndex_newWriteBatchWithIndex__JZIZ(
     JNIEnv* env, jclass jcls, jlong jfallback_index_comparator_handle,
-    jbyte jcomparator_type, jint jreserved_bytes, jboolean joverwrite_key) {
-  rocksdb::Comparator *fallback_comparator = nullptr;
-  switch(jcomparator_type) {
-      // JAVA_COMPARATOR
-      case 0x0:
-        fallback_comparator =
-            reinterpret_cast<rocksdb::ComparatorJniCallback*>(jfallback_index_comparator_handle);
-        break;
-
-      // JAVA_DIRECT_COMPARATOR
-      case 0x1:
-        fallback_comparator =
-            reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jfallback_index_comparator_handle);
-        break;
-
-      // JAVA_NATIVE_COMPARATOR_WRAPPER
-      case 0x2:
-        fallback_comparator =
-            reinterpret_cast<rocksdb::Comparator*>(jfallback_index_comparator_handle);
-        break;
-  }
+    jboolean is_direct, jint jreserved_bytes, jboolean joverwrite_key) {
+rocksdb::Comparator *fallback_comparator = nullptr;
+if(is_direct) {
+  fallback_comparator =
+      reinterpret_cast<rocksdb::DirectComparatorJniCallback*>(jfallback_index_comparator_handle);
+} else {
+  fallback_comparator =
+      reinterpret_cast<rocksdb::ComparatorJniCallback*>(jfallback_index_comparator_handle);
+}
   auto* wbwi =
       new rocksdb::WriteBatchWithIndex(
           fallback_comparator,
@@ -95,13 +83,10 @@ void Java_org_rocksdb_WriteBatchWithIndex_put__J_3BI_3BI(
   auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
   assert(wbwi != nullptr);
   auto put = [&wbwi] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wbwi->Put(key, value);
+    wbwi->Put(key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(put, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(put, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
@@ -118,13 +103,10 @@ void Java_org_rocksdb_WriteBatchWithIndex_put__J_3BI_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto put = [&wbwi, &cf_handle] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wbwi->Put(cf_handle, key, value);
+    wbwi->Put(cf_handle, key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(put, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(put, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
@@ -138,13 +120,10 @@ void Java_org_rocksdb_WriteBatchWithIndex_merge__J_3BI_3BI(
   auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
   assert(wbwi != nullptr);
   auto merge = [&wbwi] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wbwi->Merge(key, value);
+    wbwi->Merge(key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(merge, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(merge, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
@@ -161,41 +140,34 @@ void Java_org_rocksdb_WriteBatchWithIndex_merge__J_3BI_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto merge = [&wbwi, &cf_handle] (rocksdb::Slice key, rocksdb::Slice value) {
-    return wbwi->Merge(cf_handle, key, value);
+    wbwi->Merge(cf_handle, key, value);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(merge, env,
-      jobj, jkey, jkey_len, jentry_value, jentry_value_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(merge, env, jobj, jkey, jkey_len, jentry_value,
+      jentry_value_len);
 }
 
 /*
  * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    delete
+ * Method:    remove
  * Signature: (J[BI)V
  */
-void Java_org_rocksdb_WriteBatchWithIndex_delete__J_3BI(
+void Java_org_rocksdb_WriteBatchWithIndex_remove__J_3BI(
     JNIEnv* env, jobject jobj, jlong jwbwi_handle, jbyteArray jkey,
     jint jkey_len) {
   auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
   assert(wbwi != nullptr);
   auto remove = [&wbwi] (rocksdb::Slice key) {
-    return wbwi->Delete(key);
+    wbwi->Delete(key);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(remove, env,
-      jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::k_op(remove, env, jobj, jkey, jkey_len);
 }
 
 /*
  * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    delete
+ * Method:    remove
  * Signature: (J[BIJ)V
  */
-void Java_org_rocksdb_WriteBatchWithIndex_delete__J_3BIJ(
+void Java_org_rocksdb_WriteBatchWithIndex_remove__J_3BIJ(
     JNIEnv* env, jobject jobj, jlong jwbwi_handle, jbyteArray jkey,
     jint jkey_len, jlong jcf_handle) {
   auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
@@ -203,55 +175,9 @@ void Java_org_rocksdb_WriteBatchWithIndex_delete__J_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto remove = [&wbwi, &cf_handle] (rocksdb::Slice key) {
-    return wbwi->Delete(cf_handle, key);
+    wbwi->Delete(cf_handle, key);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(remove, env,
-      jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
-}
-
-/*
- * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    singleDelete
- * Signature: (J[BI)V
- */
-void Java_org_rocksdb_WriteBatchWithIndex_singleDelete__J_3BI(
-    JNIEnv* env, jobject jobj, jlong jwbwi_handle, jbyteArray jkey,
-    jint jkey_len) {
-  auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
-  assert(wbwi != nullptr);
-  auto single_delete = [&wbwi] (rocksdb::Slice key) {
-    return wbwi->SingleDelete(key);
-  };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(single_delete,
-      env, jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
-}
-
-/*
- * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    singleDelete
- * Signature: (J[BIJ)V
- */
-void Java_org_rocksdb_WriteBatchWithIndex_singleDelete__J_3BIJ(
-  JNIEnv* env, jobject jobj, jlong jwbwi_handle, jbyteArray jkey,
-  jint jkey_len, jlong jcf_handle) {
-  auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
-  assert(wbwi != nullptr);
-  auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
-  assert(cf_handle != nullptr);
-  auto single_delete = [&wbwi, &cf_handle] (rocksdb::Slice key) {
-    return wbwi->SingleDelete(cf_handle, key);
-  };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(single_delete,
-      env, jobj, jkey, jkey_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::k_op(remove, env, jobj, jkey, jkey_len);
 }
 
 /*
@@ -265,14 +191,10 @@ void Java_org_rocksdb_WriteBatchWithIndex_deleteRange__J_3BI_3BI(
   auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
   assert(wbwi != nullptr);
   auto deleteRange = [&wbwi](rocksdb::Slice beginKey, rocksdb::Slice endKey) {
-    return wbwi->DeleteRange(beginKey, endKey);
+    wbwi->DeleteRange(beginKey, endKey);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(
-      deleteRange, env, jobj, jbegin_key, jbegin_key_len, jend_key,
-      jend_key_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(deleteRange, env, jobj, jbegin_key, jbegin_key_len,
+                          jend_key, jend_key_len);
 }
 
 /*
@@ -289,15 +211,11 @@ void Java_org_rocksdb_WriteBatchWithIndex_deleteRange__J_3BI_3BIJ(
   auto* cf_handle = reinterpret_cast<rocksdb::ColumnFamilyHandle*>(jcf_handle);
   assert(cf_handle != nullptr);
   auto deleteRange = [&wbwi, &cf_handle](rocksdb::Slice beginKey,
-      rocksdb::Slice endKey) {
-    return wbwi->DeleteRange(cf_handle, beginKey, endKey);
+                                         rocksdb::Slice endKey) {
+    wbwi->DeleteRange(cf_handle, beginKey, endKey);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::kv_op(
-      deleteRange, env, jobj, jbegin_key, jbegin_key_len, jend_key,
-      jend_key_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::kv_op(deleteRange, env, jobj, jbegin_key, jbegin_key_len,
+                          jend_key, jend_key_len);
 }
 
 /*
@@ -311,13 +229,9 @@ void Java_org_rocksdb_WriteBatchWithIndex_putLogData(
   auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
   assert(wbwi != nullptr);
   auto putLogData = [&wbwi] (rocksdb::Slice blob) {
-    return wbwi->PutLogData(blob);
+    wbwi->PutLogData(blob);
   };
-  std::unique_ptr<rocksdb::Status> status = rocksdb::JniUtil::k_op(putLogData,
-      env, jobj, jblob, jblob_len);
-  if (status != nullptr && !status->ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, status);
-  }
+  rocksdb::JniUtil::k_op(putLogData, env, jobj, jblob, jblob_len);
 }
 
 /*
@@ -365,54 +279,6 @@ void Java_org_rocksdb_WriteBatchWithIndex_rollbackToSavePoint0(
   rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
 }
 
-/*
- * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    popSavePoint
- * Signature: (J)V
- */
-void Java_org_rocksdb_WriteBatchWithIndex_popSavePoint(
-    JNIEnv* env, jobject jobj, jlong jwbwi_handle) {
-  auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
-  assert(wbwi != nullptr);
-
-  auto s = wbwi->PopSavePoint();
-
-  if (s.ok()) {
-    return;
-  }
-
-  rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
-}
-
-/*
- * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    setMaxBytes
- * Signature: (JJ)V
- */
-void Java_org_rocksdb_WriteBatchWithIndex_setMaxBytes(
-    JNIEnv* env, jobject jobj, jlong jwbwi_handle, jlong jmax_bytes) {
-  auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
-  assert(wbwi != nullptr);
-
-  wbwi->SetMaxBytes(static_cast<size_t>(jmax_bytes));
-}
-
-/*
- * Class:     org_rocksdb_WriteBatchWithIndex
- * Method:    getWriteBatch
- * Signature: (J)Lorg/rocksdb/WriteBatch;
- */
-jobject Java_org_rocksdb_WriteBatchWithIndex_getWriteBatch(
-    JNIEnv* env, jobject jobj, jlong jwbwi_handle) {
-  auto* wbwi = reinterpret_cast<rocksdb::WriteBatchWithIndex*>(jwbwi_handle);
-  assert(wbwi != nullptr);
-
-  auto* wb = wbwi->GetWriteBatch();
-
-  // TODO(AR) is the `wb` object owned by us?
-  return rocksdb::WriteBatchJni::construct(env, wb);
-}
-
 /*
  * Class:     org_rocksdb_WriteBatchWithIndex
  * Method:    iterator0
@@ -685,15 +551,33 @@ jlongArray Java_org_rocksdb_WBWIRocksIterator_entry1(
 
   jlong results[3];
 
-  // set the type of the write entry
-  results[0] = rocksdb::WriteTypeJni::toJavaWriteType(we.type);
+  //set the type of the write entry
+  switch (we.type) {
+    case rocksdb::kPutRecord:
+      results[0] = 0x1;
+      break;
 
-  // NOTE: key_slice and value_slice will be freed by org.rocksdb.DirectSlice#close
+    case rocksdb::kMergeRecord:
+      results[0] = 0x2;
+      break;
+
+    case rocksdb::kDeleteRecord:
+      results[0] = 0x4;
+      break;
+
+    case rocksdb::kLogDataRecord:
+      results[0] = 0x8;
+      break;
+
+    default:
+      results[0] = 0x0;
+  }
+
+  // key_slice and value_slice will be freed by org.rocksdb.DirectSlice#close
 
   auto* key_slice = new rocksdb::Slice(we.key.data(), we.key.size());
   results[1] = reinterpret_cast<jlong>(key_slice);
   if (we.type == rocksdb::kDeleteRecord
-      || we.type == rocksdb::kSingleDeleteRecord
       || we.type == rocksdb::kLogDataRecord) {
     // set native handle of value slice to null if no value available
     results[2] = 0;

java/rocksjni/writebatchhandlerjnicallback.cc

@@ -14,62 +14,24 @@ WriteBatchHandlerJniCallback::WriteBatchHandlerJniCallback(
     JNIEnv* env, jobject jWriteBatchHandler)
     : JniCallback(env, jWriteBatchHandler), m_env(env) {
 
-  m_jPutCfMethodId = WriteBatchHandlerJni::getPutCfMethodId(env);
-  if(m_jPutCfMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
   m_jPutMethodId = WriteBatchHandlerJni::getPutMethodId(env);
   if(m_jPutMethodId == nullptr) {
     // exception thrown
     return;
   }
 
-  m_jMergeCfMethodId = WriteBatchHandlerJni::getMergeCfMethodId(env);
-  if(m_jMergeCfMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
   m_jMergeMethodId = WriteBatchHandlerJni::getMergeMethodId(env);
   if(m_jMergeMethodId == nullptr) {
     // exception thrown
     return;
   }
 
-  m_jDeleteCfMethodId = WriteBatchHandlerJni::getDeleteCfMethodId(env);
-  if(m_jDeleteCfMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
   m_jDeleteMethodId = WriteBatchHandlerJni::getDeleteMethodId(env);
   if(m_jDeleteMethodId == nullptr) {
     // exception thrown
     return;
   }
 
-  m_jSingleDeleteCfMethodId =
-      WriteBatchHandlerJni::getSingleDeleteCfMethodId(env);
-  if(m_jSingleDeleteCfMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
-  m_jSingleDeleteMethodId = WriteBatchHandlerJni::getSingleDeleteMethodId(env);
-  if(m_jSingleDeleteMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
-  m_jDeleteRangeCfMethodId =
-      WriteBatchHandlerJni::getDeleteRangeCfMethodId(env);
-  if (m_jDeleteRangeCfMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
   m_jDeleteRangeMethodId = WriteBatchHandlerJni::getDeleteRangeMethodId(env);
   if (m_jDeleteRangeMethodId == nullptr) {
     // exception thrown
@@ -82,45 +44,6 @@ WriteBatchHandlerJniCallback::WriteBatchHandlerJniCallback(
     return;
   }
 
-  m_jPutBlobIndexCfMethodId =
-      WriteBatchHandlerJni::getPutBlobIndexCfMethodId(env);
-  if(m_jPutBlobIndexCfMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
-  m_jMarkBeginPrepareMethodId =
-      WriteBatchHandlerJni::getMarkBeginPrepareMethodId(env);
-  if(m_jMarkBeginPrepareMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
-  m_jMarkEndPrepareMethodId =
-      WriteBatchHandlerJni::getMarkEndPrepareMethodId(env);
-  if(m_jMarkEndPrepareMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
-  m_jMarkNoopMethodId = WriteBatchHandlerJni::getMarkNoopMethodId(env);
-  if(m_jMarkNoopMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-    
-  m_jMarkRollbackMethodId = WriteBatchHandlerJni::getMarkRollbackMethodId(env);
-  if(m_jMarkRollbackMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
-  m_jMarkCommitMethodId = WriteBatchHandlerJni::getMarkCommitMethodId(env);
-  if(m_jMarkCommitMethodId == nullptr) {
-    // exception thrown
-    return;
-  }
-
   m_jContinueMethodId = WriteBatchHandlerJni::getContinueMethodId(env);
   if(m_jContinueMethodId == nullptr) {
     // exception thrown
@@ -128,272 +51,196 @@ WriteBatchHandlerJniCallback::WriteBatchHandlerJniCallback(
   }
 }
 
-rocksdb::Status WriteBatchHandlerJniCallback::PutCF(uint32_t column_family_id,
-    const Slice& key, const Slice& value) {
-  auto put = [this, column_family_id] (
-      jbyteArray j_key, jbyteArray j_value) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jPutCfMethodId,
-      static_cast<jint>(column_family_id),
-      j_key,
-      j_value);
-  };
-  auto status = WriteBatchHandlerJniCallback::kv_op(key, value, put);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
-  }
-}
-
 void WriteBatchHandlerJniCallback::Put(const Slice& key, const Slice& value) {
-  auto put = [this] (
-        jbyteArray j_key, jbyteArray j_value) {
-    m_env->CallVoidMethod(
+  const jbyteArray j_key = sliceToJArray(key);
+  if(j_key == nullptr) {
+    // exception thrown
+    if(m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    return;
+  }
+
+  const jbyteArray j_value = sliceToJArray(value);
+  if(j_value == nullptr) {
+    // exception thrown
+    if(m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    if(j_key != nullptr) {
+      m_env->DeleteLocalRef(j_key);
+    }
+    return;
+  }
+
+  m_env->CallVoidMethod(
       m_jcallback_obj,
       m_jPutMethodId,
       j_key,
       j_value);
-  };
-  WriteBatchHandlerJniCallback::kv_op(key, value, put);
-}
+  if(m_env->ExceptionCheck()) {
+    // exception thrown
+    m_env->ExceptionDescribe();
+    if(j_value != nullptr) {
+      m_env->DeleteLocalRef(j_value);
+    }
+    if(j_key != nullptr) {
+      m_env->DeleteLocalRef(j_key);
+    }
+    return;
+  }
 
-rocksdb::Status WriteBatchHandlerJniCallback::MergeCF(uint32_t column_family_id,
-    const Slice& key, const Slice& value) {
-  auto merge = [this, column_family_id] (
-        jbyteArray j_key, jbyteArray j_value) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jMergeCfMethodId,
-      static_cast<jint>(column_family_id),
-      j_key,
-      j_value);
-  };
-  auto status = WriteBatchHandlerJniCallback::kv_op(key, value, merge);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
+  if(j_value != nullptr) {
+    m_env->DeleteLocalRef(j_value);
+  }
+  if(j_key != nullptr) {
+    m_env->DeleteLocalRef(j_key);
   }
 }
 
 void WriteBatchHandlerJniCallback::Merge(const Slice& key, const Slice& value) {
-  auto merge = [this] (
-        jbyteArray j_key, jbyteArray j_value) {
-    m_env->CallVoidMethod(
+  const jbyteArray j_key = sliceToJArray(key);
+  if(j_key == nullptr) {
+    // exception thrown
+    if(m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    return;
+  }
+
+  const jbyteArray j_value = sliceToJArray(value);
+  if(j_value == nullptr) {
+    // exception thrown
+    if(m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    if(j_key != nullptr) {
+      m_env->DeleteLocalRef(j_key);
+    }
+    return;
+  }
+
+  m_env->CallVoidMethod(
       m_jcallback_obj,
       m_jMergeMethodId,
       j_key,
       j_value);
-  };
-  WriteBatchHandlerJniCallback::kv_op(key, value, merge);
-}
+  if(m_env->ExceptionCheck()) {
+    // exception thrown
+    m_env->ExceptionDescribe();
+    if(j_value != nullptr) {
+      m_env->DeleteLocalRef(j_value);
+    }
+    if(j_key != nullptr) {
+      m_env->DeleteLocalRef(j_key);
+    }
+    return;
+  }
 
-rocksdb::Status WriteBatchHandlerJniCallback::DeleteCF(uint32_t column_family_id,
-    const Slice& key) {
-  auto remove = [this, column_family_id] (jbyteArray j_key) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jDeleteCfMethodId,
-      static_cast<jint>(column_family_id),
-      j_key);
-  };
-  auto status = WriteBatchHandlerJniCallback::k_op(key, remove);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
+  if(j_value != nullptr) {
+    m_env->DeleteLocalRef(j_value);
+  }
+  if(j_key != nullptr) {
+    m_env->DeleteLocalRef(j_key);
   }
 }
 
 void WriteBatchHandlerJniCallback::Delete(const Slice& key) {
-  auto remove = [this] (jbyteArray j_key) {
-    m_env->CallVoidMethod(
+  const jbyteArray j_key = sliceToJArray(key);
+  if(j_key == nullptr) {
+    // exception thrown
+    if(m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    return;
+  }
+
+  m_env->CallVoidMethod(
       m_jcallback_obj,
       m_jDeleteMethodId,
       j_key);
-  };
-  WriteBatchHandlerJniCallback::k_op(key, remove);
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::SingleDeleteCF(uint32_t column_family_id,
-    const Slice& key) {
-  auto singleDelete = [this, column_family_id] (jbyteArray j_key) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jSingleDeleteCfMethodId,
-      static_cast<jint>(column_family_id),
-      j_key);
-  };
-  auto status = WriteBatchHandlerJniCallback::k_op(key, singleDelete);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
+  if(m_env->ExceptionCheck()) {
+    // exception thrown
+    m_env->ExceptionDescribe();
+    if(j_key != nullptr) {
+      m_env->DeleteLocalRef(j_key);
+    }
+    return;
   }
-}
 
-void WriteBatchHandlerJniCallback::SingleDelete(const Slice& key) {
-  auto singleDelete = [this] (jbyteArray j_key) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jSingleDeleteMethodId,
-      j_key);
-  };
-  WriteBatchHandlerJniCallback::k_op(key, singleDelete);
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::DeleteRangeCF(uint32_t column_family_id,
-    const Slice& beginKey, const Slice& endKey) {
-  auto deleteRange = [this, column_family_id] (
-        jbyteArray j_beginKey, jbyteArray j_endKey) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jDeleteRangeCfMethodId,
-      static_cast<jint>(column_family_id),
-      j_beginKey,
-      j_endKey);
-  };
-  auto status = WriteBatchHandlerJniCallback::kv_op(beginKey, endKey, deleteRange);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
+  if(j_key != nullptr) {
+    m_env->DeleteLocalRef(j_key);
   }
 }
 
 void WriteBatchHandlerJniCallback::DeleteRange(const Slice& beginKey,
-    const Slice& endKey) {
-  auto deleteRange = [this] (
-        jbyteArray j_beginKey, jbyteArray j_endKey) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jDeleteRangeMethodId,
-      j_beginKey,
-      j_endKey);
-  };
-  WriteBatchHandlerJniCallback::kv_op(beginKey, endKey, deleteRange);
+                                               const Slice& endKey) {
+  const jbyteArray j_beginKey = sliceToJArray(beginKey);
+  if (j_beginKey == nullptr) {
+    // exception thrown
+    if (m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    return;
+  }
+
+  const jbyteArray j_endKey = sliceToJArray(beginKey);
+  if (j_endKey == nullptr) {
+    // exception thrown
+    if (m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    return;
+  }
+
+  m_env->CallVoidMethod(m_jcallback_obj, m_jDeleteRangeMethodId,
+                        j_beginKey, j_endKey);
+  if (m_env->ExceptionCheck()) {
+    // exception thrown
+    m_env->ExceptionDescribe();
+    if (j_beginKey != nullptr) {
+      m_env->DeleteLocalRef(j_beginKey);
+    }
+    if (j_endKey != nullptr) {
+      m_env->DeleteLocalRef(j_endKey);
+    }
+    return;
+  }
+
+  if (j_beginKey != nullptr) {
+    m_env->DeleteLocalRef(j_beginKey);
+  }
+
+  if (j_endKey != nullptr) {
+    m_env->DeleteLocalRef(j_endKey);
+  }
 }
 
 void WriteBatchHandlerJniCallback::LogData(const Slice& blob) {
-  auto logData = [this] (jbyteArray j_blob) {
-    m_env->CallVoidMethod(
+  const jbyteArray j_blob = sliceToJArray(blob);
+  if(j_blob == nullptr) {
+    // exception thrown
+    if(m_env->ExceptionCheck()) {
+      m_env->ExceptionDescribe();
+    }
+    return;
+  }
+
+  m_env->CallVoidMethod(
       m_jcallback_obj,
       m_jLogDataMethodId,
       j_blob);
-  };
-  WriteBatchHandlerJniCallback::k_op(blob, logData);
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::PutBlobIndexCF(uint32_t column_family_id,
-    const Slice& key, const Slice& value) {
-  auto putBlobIndex = [this, column_family_id] (
-      jbyteArray j_key, jbyteArray j_value) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jPutBlobIndexCfMethodId,
-      static_cast<jint>(column_family_id),
-      j_key,
-      j_value);
-  };
-  auto status = WriteBatchHandlerJniCallback::kv_op(key, value, putBlobIndex);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
-  }
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::MarkBeginPrepare() {
-  m_env->CallVoidMethod(m_jcallback_obj, m_jMarkBeginPrepareMethodId);
-
-  // check for Exception, in-particular RocksDBException
-  if (m_env->ExceptionCheck()) {
+  if(m_env->ExceptionCheck()) {
     // exception thrown
-    jthrowable exception = m_env->ExceptionOccurred();
-    std::unique_ptr<rocksdb::Status> status = rocksdb::RocksDBExceptionJni::toCppStatus(m_env, exception);
-    if (status == nullptr) {
-      // unkown status or exception occurred extracting status
-      m_env->ExceptionDescribe();
-      return rocksdb::Status::OK();  // TODO(AR) probably need a better error code here
-
-    } else {
-      m_env->ExceptionClear();  // clear the exception, as we have extracted the status
-      return rocksdb::Status(*status);
+    m_env->ExceptionDescribe();
+    if(j_blob != nullptr) {
+      m_env->DeleteLocalRef(j_blob);
     }
+    return;
   }
 
-  return rocksdb::Status::OK();
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::MarkEndPrepare(const Slice& xid) {
-  auto markEndPrepare = [this] (
-      jbyteArray j_xid) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jMarkEndPrepareMethodId,
-      j_xid);
-  };
-  auto status = WriteBatchHandlerJniCallback::k_op(xid, markEndPrepare);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
-  }
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::MarkNoop(bool empty_batch) {
-  m_env->CallVoidMethod(m_jcallback_obj, m_jMarkNoopMethodId, static_cast<jboolean>(empty_batch));
-
-  // check for Exception, in-particular RocksDBException
-  if (m_env->ExceptionCheck()) {
-    // exception thrown
-    jthrowable exception = m_env->ExceptionOccurred();
-    std::unique_ptr<rocksdb::Status> status = rocksdb::RocksDBExceptionJni::toCppStatus(m_env, exception);
-    if (status == nullptr) {
-      // unkown status or exception occurred extracting status
-      m_env->ExceptionDescribe();
-      return rocksdb::Status::OK();  // TODO(AR) probably need a better error code here
-
-    } else {
-      m_env->ExceptionClear();  // clear the exception, as we have extracted the status
-      return rocksdb::Status(*status);
-    }
-  }
-
-  return rocksdb::Status::OK();
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::MarkRollback(const Slice& xid) {
-  auto markRollback = [this] (
-      jbyteArray j_xid) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jMarkRollbackMethodId,
-      j_xid);
-  };
-  auto status = WriteBatchHandlerJniCallback::k_op(xid, markRollback);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
-  }
-}
-
-rocksdb::Status WriteBatchHandlerJniCallback::MarkCommit(const Slice& xid) {
-  auto markCommit = [this] (
-      jbyteArray j_xid) {
-    m_env->CallVoidMethod(
-      m_jcallback_obj,
-      m_jMarkCommitMethodId,
-      j_xid);
-  };
-  auto status = WriteBatchHandlerJniCallback::k_op(xid, markCommit);
-  if(status == nullptr) {
-    return rocksdb::Status::OK();   // TODO(AR) what to do if there is an Exception but we don't know the rocksdb::Status?
-  } else {
-    return rocksdb::Status(*status);
+  if(j_blob != nullptr) {
+    m_env->DeleteLocalRef(j_blob);
   }
 }
 
@@ -409,101 +256,39 @@ bool WriteBatchHandlerJniCallback::Continue() {
   return static_cast<bool>(jContinue == JNI_TRUE);
 }
 
-std::unique_ptr<rocksdb::Status> WriteBatchHandlerJniCallback::kv_op(const Slice& key, const Slice& value, std::function<void(jbyteArray, jbyteArray)> kvFn) {
-    const jbyteArray j_key = JniUtil::copyBytes(m_env, key);
-  if (j_key == nullptr) {
-    // exception thrown
-    if (m_env->ExceptionCheck()) {
-      m_env->ExceptionDescribe();
-    }
+/*
+ * Creates a Java Byte Array from the data in a Slice
+ *
+ * When calling this function
+ * you must remember to call env->DeleteLocalRef
+ * on the result after you have finished with it
+ *
+ * @param s A Slice to convery to a Java byte array
+ *
+ * @return A reference to a Java byte array, or a nullptr if an
+ *     exception occurs
+ */
+jbyteArray WriteBatchHandlerJniCallback::sliceToJArray(const Slice& s) {
+
+  // TODO(AR) move to JniUtil
+
+  jbyteArray ja = m_env->NewByteArray(static_cast<jsize>(s.size()));
+  if(ja == nullptr) {
+    // exception thrown: OutOfMemoryError
     return nullptr;
   }
 
-  const jbyteArray j_value = JniUtil::copyBytes(m_env, value);
-  if (j_value == nullptr) {
-    // exception thrown
-    if (m_env->ExceptionCheck()) {
-      m_env->ExceptionDescribe();
-    }
-    if (j_key != nullptr) {
-      m_env->DeleteLocalRef(j_key);
+  m_env->SetByteArrayRegion(
+      ja, 0, static_cast<jsize>(s.size()),
+      const_cast<jbyte*>(reinterpret_cast<const jbyte*>(s.data())));
+  if(m_env->ExceptionCheck()) {
+    if(ja != nullptr) {
+      m_env->DeleteLocalRef(ja);
     }
+    // exception thrown: ArrayIndexOutOfBoundsException
     return nullptr;
   }
 
-  kvFn(j_key, j_value);
-
-  // check for Exception, in-particular RocksDBException
-  if (m_env->ExceptionCheck()) {
-    if (j_value != nullptr) {
-      m_env->DeleteLocalRef(j_value);
-    }
-    if (j_key != nullptr) {
-      m_env->DeleteLocalRef(j_key);
-    }
-
-    // exception thrown
-    jthrowable exception = m_env->ExceptionOccurred();
-    std::unique_ptr<rocksdb::Status> status = rocksdb::RocksDBExceptionJni::toCppStatus(m_env, exception);
-    if (status == nullptr) {
-      // unkown status or exception occurred extracting status
-      m_env->ExceptionDescribe();
-      return nullptr;
-
-    } else {
-      m_env->ExceptionClear();  // clear the exception, as we have extracted the status
-      return status;
-    }
-  }
-
-  if (j_value != nullptr) {
-    m_env->DeleteLocalRef(j_value);
-  }
-  if (j_key != nullptr) {
-    m_env->DeleteLocalRef(j_key);
-  }
-
-  // all OK
-  return std::unique_ptr<rocksdb::Status>(new rocksdb::Status(rocksdb::Status::OK()));
-}
-
-std::unique_ptr<rocksdb::Status> WriteBatchHandlerJniCallback::k_op(const Slice& key, std::function<void(jbyteArray)> kFn) {
-    const jbyteArray j_key = JniUtil::copyBytes(m_env, key);
-  if (j_key == nullptr) {
-    // exception thrown
-    if (m_env->ExceptionCheck()) {
-      m_env->ExceptionDescribe();
-    }
-    return nullptr;
-  }
-
-  kFn(j_key);
-
-  // check for Exception, in-particular RocksDBException
-  if (m_env->ExceptionCheck()) {
-    if (j_key != nullptr) {
-      m_env->DeleteLocalRef(j_key);
-    }
-
-    // exception thrown
-    jthrowable exception = m_env->ExceptionOccurred();
-    std::unique_ptr<rocksdb::Status> status = rocksdb::RocksDBExceptionJni::toCppStatus(m_env, exception);
-    if (status == nullptr) {
-      // unkown status or exception occurred extracting status
-      m_env->ExceptionDescribe();
-      return nullptr;
-
-    } else {
-      m_env->ExceptionClear();  // clear the exception, as we have extracted the status
-      return status;
-    }
-  }
-
-  if (j_key != nullptr) {
-    m_env->DeleteLocalRef(j_key);
-  }
-
-  // all OK
-  return std::unique_ptr<rocksdb::Status>(new rocksdb::Status(rocksdb::Status::OK()));
+  return ja;
 }
 }  // namespace rocksdb

java/rocksjni/writebatchhandlerjnicallback.h

@@ -9,9 +9,7 @@
 #ifndef JAVA_ROCKSJNI_WRITEBATCHHANDLERJNICALLBACK_H_
 #define JAVA_ROCKSJNI_WRITEBATCHHANDLERJNICALLBACK_H_
 
-#include <functional>
 #include <jni.h>
-#include <memory>
 #include "rocksjni/jnicallback.h"
 #include "rocksdb/write_batch.h"
 
@@ -27,57 +25,22 @@ class WriteBatchHandlerJniCallback : public JniCallback, public WriteBatch::Hand
  public:
     WriteBatchHandlerJniCallback(
       JNIEnv* env, jobject jWriteBackHandler);
-    Status PutCF(uint32_t column_family_id, const Slice& key,
-        const Slice& value);
     void Put(const Slice& key, const Slice& value);
-    Status MergeCF(uint32_t column_family_id, const Slice& key,
-        const Slice& value);
     void Merge(const Slice& key, const Slice& value);
-    Status DeleteCF(uint32_t column_family_id, const Slice& key);
     void Delete(const Slice& key);
-    Status SingleDeleteCF(uint32_t column_family_id, const Slice& key);
-    void SingleDelete(const Slice& key);
-    Status DeleteRangeCF(uint32_t column_family_id, const Slice& beginKey,
-        const Slice& endKey);
     void DeleteRange(const Slice& beginKey, const Slice& endKey);
     void LogData(const Slice& blob);
-    Status PutBlobIndexCF(uint32_t column_family_id, const Slice& key,
-        const Slice& value);
-    Status MarkBeginPrepare();
-    Status MarkEndPrepare(const Slice& xid);
-    Status MarkNoop(bool empty_batch);
-    Status MarkRollback(const Slice& xid);
-    Status MarkCommit(const Slice& xid);
     bool Continue();
 
  private:
     JNIEnv* m_env;
-    jmethodID m_jPutCfMethodId;
+    jbyteArray sliceToJArray(const Slice& s);
     jmethodID m_jPutMethodId;
-    jmethodID m_jMergeCfMethodId;
     jmethodID m_jMergeMethodId;
-    jmethodID m_jDeleteCfMethodId;
     jmethodID m_jDeleteMethodId;
-    jmethodID m_jSingleDeleteCfMethodId;
-    jmethodID m_jSingleDeleteMethodId;
-    jmethodID m_jDeleteRangeCfMethodId;
     jmethodID m_jDeleteRangeMethodId;
     jmethodID m_jLogDataMethodId;
-    jmethodID m_jPutBlobIndexCfMethodId;
-    jmethodID m_jMarkBeginPrepareMethodId;
-    jmethodID m_jMarkEndPrepareMethodId;
-    jmethodID m_jMarkNoopMethodId;
-    jmethodID m_jMarkRollbackMethodId;
-    jmethodID m_jMarkCommitMethodId;
     jmethodID m_jContinueMethodId;
-    /**
-     * @return A pointer to a rocksdb::Status or nullptr if an unexpected exception occurred
-     */
-    std::unique_ptr<rocksdb::Status> kv_op(const Slice& key, const Slice& value, std::function<void(jbyteArray, jbyteArray)> kvFn);
-    /**
-     * @return A pointer to a rocksdb::Status or nullptr if an unexpected exception occurred
-     */
-    std::unique_ptr<rocksdb::Status> k_op(const Slice& key, std::function<void(jbyteArray)> kFn);
 };
 }  // namespace rocksdb
 

java/samples/src/main/java/OptimisticTransactionSample.java

@@ -1,184 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-import org.rocksdb.*;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Demonstrates using Transactions on an OptimisticTransactionDB with
- * varying isolation guarantees
- */
-public class OptimisticTransactionSample {
-  private static final String dbPath = "/tmp/rocksdb_optimistic_transaction_example";
-
-  public static final void main(final String args[]) throws RocksDBException {
-
-    try(final Options options = new Options()
-        .setCreateIfMissing(true);
-        final OptimisticTransactionDB txnDb =
-            OptimisticTransactionDB.open(options, dbPath)) {
-
-      try (final WriteOptions writeOptions = new WriteOptions();
-           final ReadOptions readOptions = new ReadOptions()) {
-
-        ////////////////////////////////////////////////////////
-        //
-        // Simple OptimisticTransaction Example ("Read Committed")
-        //
-        ////////////////////////////////////////////////////////
-        readCommitted(txnDb, writeOptions, readOptions);
-
-
-        ////////////////////////////////////////////////////////
-        //
-        // "Repeatable Read" (Snapshot Isolation) Example
-        //   -- Using a single Snapshot
-        //
-        ////////////////////////////////////////////////////////
-        repeatableRead(txnDb, writeOptions, readOptions);
-
-
-        ////////////////////////////////////////////////////////
-        //
-        // "Read Committed" (Monotonic Atomic Views) Example
-        //   --Using multiple Snapshots
-        //
-        ////////////////////////////////////////////////////////
-        readCommitted_monotonicAtomicViews(txnDb, writeOptions, readOptions);
-      }
-    }
-  }
-
-  /**
-   * Demonstrates "Read Committed" isolation
-   */
-  private static void readCommitted(final OptimisticTransactionDB txnDb,
-      final WriteOptions writeOptions, final ReadOptions readOptions)
-      throws RocksDBException {
-    final byte key1[] = "abc".getBytes(UTF_8);
-    final byte value1[] = "def".getBytes(UTF_8);
-
-    final byte key2[] = "xyz".getBytes(UTF_8);
-    final byte value2[] = "zzz".getBytes(UTF_8);
-
-    // Start a transaction
-    try(final Transaction txn = txnDb.beginTransaction(writeOptions)) {
-      // Read a key in this transaction
-      byte[] value = txn.get(readOptions, key1);
-      assert(value == null);
-
-      // Write a key in this transaction
-      txn.put(key1, value1);
-
-      // Read a key OUTSIDE this transaction. Does not affect txn.
-      value = txnDb.get(readOptions, key1);
-      assert(value == null);
-
-      // Write a key OUTSIDE of this transaction.
-      // Does not affect txn since this is an unrelated key.
-      // If we wrote key 'abc' here, the transaction would fail to commit.
-      txnDb.put(writeOptions, key2, value2);
-
-      // Commit transaction
-      txn.commit();
-    }
-  }
-
-  /**
-   * Demonstrates "Repeatable Read" (Snapshot Isolation) isolation
-   */
-  private static void repeatableRead(final OptimisticTransactionDB txnDb,
-      final WriteOptions writeOptions, final ReadOptions readOptions)
-      throws RocksDBException {
-
-    final byte key1[] = "ghi".getBytes(UTF_8);
-    final byte value1[] = "jkl".getBytes(UTF_8);
-
-    // Set a snapshot at start of transaction by setting setSnapshot(true)
-    try(final OptimisticTransactionOptions txnOptions =
-            new OptimisticTransactionOptions().setSetSnapshot(true);
-        final Transaction txn =
-            txnDb.beginTransaction(writeOptions, txnOptions)) {
-
-      final Snapshot snapshot = txn.getSnapshot();
-
-      // Write a key OUTSIDE of transaction
-      txnDb.put(writeOptions, key1, value1);
-
-      // Read a key using the snapshot.
-      readOptions.setSnapshot(snapshot);
-      final byte[] value = txn.getForUpdate(readOptions, key1, true);
-      assert(value == value1);
-
-      try {
-        // Attempt to commit transaction
-        txn.commit();
-        throw new IllegalStateException();
-      } catch(final RocksDBException e) {
-        // Transaction could not commit since the write outside of the txn
-        // conflicted with the read!
-        assert(e.getStatus().getCode() == Status.Code.Busy);
-      }
-
-      txn.rollback();
-    } finally {
-      // Clear snapshot from read options since it is no longer valid
-      readOptions.setSnapshot(null);
-    }
-  }
-
-  /**
-   * Demonstrates "Read Committed" (Monotonic Atomic Views) isolation
-   *
-   * In this example, we set the snapshot multiple times.  This is probably
-   * only necessary if you have very strict isolation requirements to
-   * implement.
-   */
-  private static void readCommitted_monotonicAtomicViews(
-      final OptimisticTransactionDB txnDb, final WriteOptions writeOptions,
-      final ReadOptions readOptions) throws RocksDBException {
-
-    final byte keyX[] = "x".getBytes(UTF_8);
-    final byte valueX[] = "x".getBytes(UTF_8);
-
-    final byte keyY[] = "y".getBytes(UTF_8);
-    final byte valueY[] = "y".getBytes(UTF_8);
-
-    try (final OptimisticTransactionOptions txnOptions =
-             new OptimisticTransactionOptions().setSetSnapshot(true);
-         final Transaction txn =
-             txnDb.beginTransaction(writeOptions, txnOptions)) {
-
-      // Do some reads and writes to key "x"
-      Snapshot snapshot = txnDb.getSnapshot();
-      readOptions.setSnapshot(snapshot);
-      byte[] value = txn.get(readOptions, keyX);
-      txn.put(valueX, valueX);
-
-      // Do a write outside of the transaction to key "y"
-      txnDb.put(writeOptions, keyY, valueY);
-
-      // Set a new snapshot in the transaction
-      txn.setSnapshot();
-      snapshot = txnDb.getSnapshot();
-      readOptions.setSnapshot(snapshot);
-
-      // Do some reads and writes to key "y"
-      // Since the snapshot was advanced, the write done outside of the
-      // transaction does not conflict.
-      value = txn.getForUpdate(readOptions, keyY, true);
-      txn.put(keyY, valueY);
-
-      // Commit.  Since the snapshot was advanced, the write done outside of the
-      // transaction does not prevent this transaction from Committing.
-      txn.commit();
-
-    } finally {
-      // Clear snapshot from read options since it is no longer valid
-      readOptions.setSnapshot(null);
-    }
-  }
-}

java/samples/src/main/java/TransactionSample.java

@@ -1,183 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-import org.rocksdb.*;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Demonstrates using Transactions on a TransactionDB with
- * varying isolation guarantees
- */
-public class TransactionSample {
-  private static final String dbPath = "/tmp/rocksdb_transaction_example";
-
-  public static final void main(final String args[]) throws RocksDBException {
-
-    try(final Options options = new Options()
-        .setCreateIfMissing(true);
-        final TransactionDBOptions txnDbOptions = new TransactionDBOptions();
-        final TransactionDB txnDb =
-            TransactionDB.open(options, txnDbOptions, dbPath)) {
-
-      try (final WriteOptions writeOptions = new WriteOptions();
-           final ReadOptions readOptions = new ReadOptions()) {
-
-        ////////////////////////////////////////////////////////
-        //
-        // Simple Transaction Example ("Read Committed")
-        //
-        ////////////////////////////////////////////////////////
-        readCommitted(txnDb, writeOptions, readOptions);
-
-
-        ////////////////////////////////////////////////////////
-        //
-        // "Repeatable Read" (Snapshot Isolation) Example
-        //   -- Using a single Snapshot
-        //
-        ////////////////////////////////////////////////////////
-        repeatableRead(txnDb, writeOptions, readOptions);
-
-
-        ////////////////////////////////////////////////////////
-        //
-        // "Read Committed" (Monotonic Atomic Views) Example
-        //   --Using multiple Snapshots
-        //
-        ////////////////////////////////////////////////////////
-        readCommitted_monotonicAtomicViews(txnDb, writeOptions, readOptions);
-      }
-    }
-  }
-
-  /**
-   * Demonstrates "Read Committed" isolation
-   */
-  private static void readCommitted(final TransactionDB txnDb,
-      final WriteOptions writeOptions, final ReadOptions readOptions)
-      throws RocksDBException {
-    final byte key1[] = "abc".getBytes(UTF_8);
-    final byte value1[] = "def".getBytes(UTF_8);
-
-    final byte key2[] = "xyz".getBytes(UTF_8);
-    final byte value2[] = "zzz".getBytes(UTF_8);
-
-    // Start a transaction
-    try(final Transaction txn = txnDb.beginTransaction(writeOptions)) {
-      // Read a key in this transaction
-      byte[] value = txn.get(readOptions, key1);
-      assert(value == null);
-
-      // Write a key in this transaction
-      txn.put(key1, value1);
-
-      // Read a key OUTSIDE this transaction. Does not affect txn.
-      value = txnDb.get(readOptions, key1);
-      assert(value == null);
-
-      // Write a key OUTSIDE of this transaction.
-      // Does not affect txn since this is an unrelated key.
-      // If we wrote key 'abc' here, the transaction would fail to commit.
-      txnDb.put(writeOptions, key2, value2);
-
-      // Commit transaction
-      txn.commit();
-    }
-  }
-
-  /**
-   * Demonstrates "Repeatable Read" (Snapshot Isolation) isolation
-   */
-  private static void repeatableRead(final TransactionDB txnDb,
-      final WriteOptions writeOptions, final ReadOptions readOptions)
-      throws RocksDBException {
-
-    final byte key1[] = "ghi".getBytes(UTF_8);
-    final byte value1[] = "jkl".getBytes(UTF_8);
-
-    // Set a snapshot at start of transaction by setting setSnapshot(true)
-    try(final TransactionOptions txnOptions = new TransactionOptions()
-          .setSetSnapshot(true);
-        final Transaction txn =
-            txnDb.beginTransaction(writeOptions, txnOptions)) {
-
-      final Snapshot snapshot = txn.getSnapshot();
-
-      // Write a key OUTSIDE of transaction
-      txnDb.put(writeOptions, key1, value1);
-
-      // Attempt to read a key using the snapshot.  This will fail since
-      // the previous write outside this txn conflicts with this read.
-      readOptions.setSnapshot(snapshot);
-
-      try {
-        final byte[] value = txn.getForUpdate(readOptions, key1, true);
-        throw new IllegalStateException();
-      } catch(final RocksDBException e) {
-        assert(e.getStatus().getCode() == Status.Code.Busy);
-      }
-
-      txn.rollback();
-    } finally {
-      // Clear snapshot from read options since it is no longer valid
-      readOptions.setSnapshot(null);
-    }
-  }
-
-  /**
-   * Demonstrates "Read Committed" (Monotonic Atomic Views) isolation
-   *
-   * In this example, we set the snapshot multiple times.  This is probably
-   * only necessary if you have very strict isolation requirements to
-   * implement.
-   */
-  private static void readCommitted_monotonicAtomicViews(
-      final TransactionDB txnDb, final WriteOptions writeOptions,
-      final ReadOptions readOptions) throws RocksDBException {
-
-    final byte keyX[] = "x".getBytes(UTF_8);
-    final byte valueX[] = "x".getBytes(UTF_8);
-
-    final byte keyY[] = "y".getBytes(UTF_8);
-    final byte valueY[] = "y".getBytes(UTF_8);
-
-    try (final TransactionOptions txnOptions = new TransactionOptions()
-        .setSetSnapshot(true);
-         final Transaction txn =
-             txnDb.beginTransaction(writeOptions, txnOptions)) {
-
-      // Do some reads and writes to key "x"
-      Snapshot snapshot = txnDb.getSnapshot();
-      readOptions.setSnapshot(snapshot);
-      byte[] value = txn.get(readOptions, keyX);
-      txn.put(valueX, valueX);
-
-      // Do a write outside of the transaction to key "y"
-      txnDb.put(writeOptions, keyY, valueY);
-
-      // Set a new snapshot in the transaction
-      txn.setSnapshot();
-      txn.setSavePoint();
-      snapshot = txnDb.getSnapshot();
-      readOptions.setSnapshot(snapshot);
-
-      // Do some reads and writes to key "y"
-      // Since the snapshot was advanced, the write done outside of the
-      // transaction does not conflict.
-      value = txn.getForUpdate(readOptions, keyY, true);
-      txn.put(keyY, valueY);
-
-      // Decide we want to revert the last write from this transaction.
-      txn.rollbackToSavePoint();
-
-      // Commit.
-      txn.commit();
-    } finally {
-      // Clear snapshot from read options since it is no longer valid
-      readOptions.setSnapshot(null);
-    }
-  }
-}

java/src/main/java/org/rocksdb/AbstractComparator.java

@@ -17,23 +17,10 @@ package org.rocksdb;
 public abstract class AbstractComparator<T extends AbstractSlice<?>>
     extends RocksCallbackObject {
 
-  protected AbstractComparator() {
-    super();
-  }
-
   protected AbstractComparator(final ComparatorOptions copt) {
     super(copt.nativeHandle_);
   }
 
-  /**
-   * Get the type of this comparator.
-   *
-   * Used for determining the correct C++ cast in native code.
-   *
-   * @return The type of the comparator.
-   */
-  abstract ComparatorType getComparatorType();
-
   /**
    * The name of the comparator.  Used to check for comparator
    * mismatches (i.e., a DB created with one comparator is

java/src/main/java/org/rocksdb/AbstractTransactionNotifier.java

@@ -1,54 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-/**
- * Provides notification to the caller of SetSnapshotOnNextOperation when
- * the actual snapshot gets created
- */
-public abstract class AbstractTransactionNotifier
-    extends RocksCallbackObject {
-
-  protected AbstractTransactionNotifier() {
-    super();
-  }
-
-  /**
-   * Implement this method to receive notification when a snapshot is
-   * requested via {@link Transaction#setSnapshotOnNextOperation()}.
-   *
-   * @param newSnapshot the snapshot that has been created.
-   */
-  public abstract void snapshotCreated(final Snapshot newSnapshot);
-
-  /**
-   * This is intentionally private as it is the callback hook
-   * from JNI
-   */
-  private void snapshotCreated(final long snapshotHandle) {
-    snapshotCreated(new Snapshot(snapshotHandle));
-  }
-
-  @Override
-  protected long initializeNative(final long... nativeParameterHandles) {
-    return createNewTransactionNotifier();
-  }
-
-  private native long createNewTransactionNotifier();
-
-  /**
-   * Deletes underlying C++ TransactionNotifier pointer.
-   *
-   * Note that this function should be called only after all
-   * Transactions referencing the comparator are closed.
-   * Otherwise an undefined behavior will occur.
-   */
-  @Override
-  protected void disposeInternal() {
-    disposeInternal(nativeHandle_);
-  }
-  protected final native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/AbstractWriteBatch.java

@@ -18,80 +18,52 @@ public abstract class AbstractWriteBatch extends RocksObject
   }
 
   @Override
-  public void put(byte[] key, byte[] value) throws RocksDBException {
+  public void put(byte[] key, byte[] value) {
     put(nativeHandle_, key, key.length, value, value.length);
   }
 
   @Override
   public void put(ColumnFamilyHandle columnFamilyHandle, byte[] key,
-      byte[] value) throws RocksDBException {
+      byte[] value) {
     put(nativeHandle_, key, key.length, value, value.length,
         columnFamilyHandle.nativeHandle_);
   }
 
   @Override
-  public void merge(byte[] key, byte[] value) throws RocksDBException {
+  public void merge(byte[] key, byte[] value) {
     merge(nativeHandle_, key, key.length, value, value.length);
   }
 
   @Override
   public void merge(ColumnFamilyHandle columnFamilyHandle, byte[] key,
-      byte[] value) throws RocksDBException {
+      byte[] value) {
     merge(nativeHandle_, key, key.length, value, value.length,
         columnFamilyHandle.nativeHandle_);
   }
 
   @Override
-  @Deprecated
-  public void remove(byte[] key) throws RocksDBException {
-    delete(nativeHandle_, key, key.length);
+  public void remove(byte[] key) {
+    remove(nativeHandle_, key, key.length);
   }
 
   @Override
-  @Deprecated
-  public void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key)
-      throws RocksDBException {
-    delete(nativeHandle_, key, key.length, columnFamilyHandle.nativeHandle_);
+  public void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key) {
+    remove(nativeHandle_, key, key.length, columnFamilyHandle.nativeHandle_);
   }
 
   @Override
-  public void delete(byte[] key) throws RocksDBException {
-    delete(nativeHandle_, key, key.length);
-  }
-
-  @Override
-  public void delete(ColumnFamilyHandle columnFamilyHandle, byte[] key)
-      throws RocksDBException {
-    delete(nativeHandle_, key, key.length, columnFamilyHandle.nativeHandle_);
-  }
-
-
-  @Override
-  public void singleDelete(byte[] key) throws RocksDBException {
-    singleDelete(nativeHandle_, key, key.length);
-  }
-
-  @Override
-  public void singleDelete(ColumnFamilyHandle columnFamilyHandle, byte[] key)
-      throws RocksDBException {
-    singleDelete(nativeHandle_, key, key.length, columnFamilyHandle.nativeHandle_);
-  }
-
-  @Override
-  public void deleteRange(byte[] beginKey, byte[] endKey)
-      throws RocksDBException {
+  public void deleteRange(byte[] beginKey, byte[] endKey) {
     deleteRange(nativeHandle_, beginKey, beginKey.length, endKey, endKey.length);
   }
 
   @Override
-  public void deleteRange(ColumnFamilyHandle columnFamilyHandle,
-      byte[] beginKey, byte[] endKey) throws RocksDBException {
+  public void deleteRange(ColumnFamilyHandle columnFamilyHandle, byte[] beginKey, byte[] endKey) {
     deleteRange(nativeHandle_, beginKey, beginKey.length, endKey, endKey.length,
         columnFamilyHandle.nativeHandle_);
   }
 
   @Override
-  public void putLogData(byte[] blob) throws RocksDBException {
+  public void putLogData(byte[] blob) {
     putLogData(nativeHandle_, blob, blob.length);
   }
 
@@ -110,67 +82,38 @@ public abstract class AbstractWriteBatch extends RocksObject
     rollbackToSavePoint0(nativeHandle_);
   }
 
-  @Override
-  public void popSavePoint() throws RocksDBException {
-    popSavePoint(nativeHandle_);
-  }
-
-  @Override
-  public void setMaxBytes(final long maxBytes) {
-    setMaxBytes(nativeHandle_, maxBytes);
-  }
-
-  @Override
-  public WriteBatch getWriteBatch() {
-    return getWriteBatch(nativeHandle_);
-  }
-
   abstract int count0(final long handle);
 
   abstract void put(final long handle, final byte[] key, final int keyLen,
-      final byte[] value, final int valueLen) throws RocksDBException;
+      final byte[] value, final int valueLen);
 
   abstract void put(final long handle, final byte[] key, final int keyLen,
-      final byte[] value, final int valueLen, final long cfHandle)
-      throws RocksDBException;
+      final byte[] value, final int valueLen, final long cfHandle);
 
   abstract void merge(final long handle, final byte[] key, final int keyLen,
-      final byte[] value, final int valueLen) throws RocksDBException;
+      final byte[] value, final int valueLen);
 
   abstract void merge(final long handle, final byte[] key, final int keyLen,
-      final byte[] value, final int valueLen, final long cfHandle)
-      throws RocksDBException;
+      final byte[] value, final int valueLen, final long cfHandle);
 
-  abstract void delete(final long handle, final byte[] key,
-      final int keyLen) throws RocksDBException;
+  abstract void remove(final long handle, final byte[] key,
+      final int keyLen);
 
-  abstract void delete(final long handle, final byte[] key,
-      final int keyLen, final long cfHandle) throws RocksDBException;
-
-  abstract void singleDelete(final long handle, final byte[] key,
-                       final int keyLen) throws RocksDBException;
-
-  abstract void singleDelete(final long handle, final byte[] key,
-                       final int keyLen, final long cfHandle) throws RocksDBException;
+  abstract void remove(final long handle, final byte[] key,
+      final int keyLen, final long cfHandle);
 
   abstract void deleteRange(final long handle, final byte[] beginKey, final int beginKeyLen,
-      final byte[] endKey, final int endKeyLen) throws RocksDBException;
+      final byte[] endKey, final int endKeyLen);
 
   abstract void deleteRange(final long handle, final byte[] beginKey, final int beginKeyLen,
-      final byte[] endKey, final int endKeyLen, final long cfHandle) throws RocksDBException;
+      final byte[] endKey, final int endKeyLen, final long cfHandle);
 
   abstract void putLogData(final long handle, final byte[] blob,
-      final int blobLen) throws RocksDBException;
+      final int blobLen);
 
   abstract void clear0(final long handle);
 
   abstract void setSavePoint0(final long handle);
 
   abstract void rollbackToSavePoint0(final long handle);
-
-  abstract void popSavePoint(final long handle) throws RocksDBException;
-
-  abstract void setMaxBytes(final long handle, long maxBytes);
-
-  abstract WriteBatch getWriteBatch(final long handle);
 }

java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java

@@ -5,8 +5,6 @@
 
 package org.rocksdb;
 
-import java.util.Arrays;
-
 /**
  * <p>Describes a column family with a
  * name and respective Options.</p>
@@ -34,7 +32,7 @@ public class ColumnFamilyDescriptor {
    * @since 3.10.0
    */
   public ColumnFamilyDescriptor(final byte[] columnFamilyName,
-                                final ColumnFamilyOptions columnFamilyOptions) {
+      final ColumnFamilyOptions columnFamilyOptions) {
     columnFamilyName_ = columnFamilyName;
     columnFamilyOptions_ = columnFamilyOptions;
   }
@@ -45,63 +43,17 @@ public class ColumnFamilyDescriptor {
    * @return column family name.
    * @since 3.10.0
    */
-  public byte[] getName() {
+  public byte[] columnFamilyName() {
     return columnFamilyName_;
   }
 
-  /**
-   * Retrieve name of column family.
-   *
-   * @return column family name.
-   * @since 3.10.0
-   *
-   * @deprecated Use {@link #getName()} instead.
-   */
-  @Deprecated
-  public byte[] columnFamilyName() {
-    return getName();
-  }
-
   /**
    * Retrieve assigned options instance.
    *
    * @return Options instance assigned to this instance.
    */
-  public ColumnFamilyOptions getOptions() {
-    return columnFamilyOptions_;
-  }
-
-  /**
-   * Retrieve assigned options instance.
-   *
-   * @return Options instance assigned to this instance.
-   *
-   * @deprecated Use {@link #getOptions()} instead.
-   */
-  @Deprecated
   public ColumnFamilyOptions columnFamilyOptions() {
-    return getOptions();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    final ColumnFamilyDescriptor that = (ColumnFamilyDescriptor) o;
-    return Arrays.equals(columnFamilyName_, that.columnFamilyName_)
-            && columnFamilyOptions_.nativeHandle_ == that.columnFamilyOptions_.nativeHandle_;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = (int) (columnFamilyOptions_.nativeHandle_ ^ (columnFamilyOptions_.nativeHandle_ >>> 32));
-    result = 31 * result + Arrays.hashCode(columnFamilyName_);
-    return result;
+    return columnFamilyOptions_;
   }
 
   private final byte[] columnFamilyName_;

java/src/main/java/org/rocksdb/ColumnFamilyHandle.java

@@ -5,9 +5,6 @@
 
 package org.rocksdb;
 
-import java.util.Arrays;
-import java.util.Objects;
-
 /**
  * ColumnFamilyHandle class to hold handles to underlying rocksdb
  * ColumnFamily Pointers.
@@ -24,63 +21,6 @@ public class ColumnFamilyHandle extends RocksObject {
     this.rocksDB_ = rocksDB;
   }
 
-  /**
-   * Gets the name of the Column Family.
-   *
-   * @return The name of the Column Family.
-   */
-  public byte[] getName() {
-    return getName(nativeHandle_);
-  }
-
-  /**
-   * Gets the ID of the Column Family.
-   *
-   * @return the ID of the Column Family.
-   */
-  public int getID() {
-    return getID(nativeHandle_);
-  }
-
-  /**
-   * Gets the up-to-date descriptor of the column family
-   * associated with this handle. Since it fills "*desc" with the up-to-date
-   * information, this call might internally lock and release DB mutex to
-   * access the up-to-date CF options. In addition, all the pointer-typed
-   * options cannot be referenced any longer than the original options exist.
-   *
-   * Note that this function is not supported in RocksDBLite.
-   *
-   * @return the up-to-date descriptor.
-   *
-   * @throws RocksDBException if an error occurs whilst retrieving the
-   *     descriptor.
-   */
-  public ColumnFamilyDescriptor getDescriptor() throws RocksDBException {
-    assert(isOwningHandle());
-    return getDescriptor(nativeHandle_);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    final ColumnFamilyHandle that = (ColumnFamilyHandle) o;
-    return rocksDB_.nativeHandle_ == that.rocksDB_.nativeHandle_ &&
-        getID() == that.getID() &&
-        Arrays.equals(getName(), that.getName());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(getName(), getID(), rocksDB_.nativeHandle_);
-  }
-
   /**
    * <p>Deletes underlying C++ iterator pointer.</p>
    *
@@ -96,9 +36,6 @@ public class ColumnFamilyHandle extends RocksObject {
     }
   }
 
-  private native byte[] getName(final long handle);
-  private native int getID(final long handle);
-  private native ColumnFamilyDescriptor getDescriptor(final long handle) throws RocksDBException;
   @Override protected final native void disposeInternal(final long handle);
 
   private final RocksDB rocksDB_;

java/src/main/java/org/rocksdb/ColumnFamilyOptions.java

@@ -33,18 +33,6 @@ public class ColumnFamilyOptions extends RocksObject
     super(newColumnFamilyOptions());
   }
 
-  /**
-   * <p>Constructor to be used by
-   * {@link #getColumnFamilyOptionsFromProps(java.util.Properties)},
-   * {@link ColumnFamilyDescriptor#columnFamilyOptions()}
-   * and also called via JNI.</p>
-   *
-   * @param handle native handle to ColumnFamilyOptions instance.
-   */
-  ColumnFamilyOptions(final long handle) {
-    super(handle);
-  }
-
   /**
    * <p>Method to get a options instance by using pre-configured
    * property values. If one or many values are undefined in
@@ -143,7 +131,7 @@ public class ColumnFamilyOptions extends RocksObject
       final AbstractComparator<? extends AbstractSlice<?>> comparator) {
     assert (isOwningHandle());
     setComparatorHandle(nativeHandle_, comparator.nativeHandle_,
-            comparator.getComparatorType().getValue());
+            comparator instanceof DirectComparator);
     comparator_ = comparator;
     return this;
   }
@@ -780,6 +768,17 @@ public class ColumnFamilyOptions extends RocksObject
     return forceConsistencyChecks(nativeHandle_);
   }
 
+  /**
+   * <p>Constructor to be used by
+   * {@link #getColumnFamilyOptionsFromProps(java.util.Properties)}</p>
+   * and also called via JNI.
+   *
+   * @param handle native handle to ColumnFamilyOptions instance.
+   */
+  public ColumnFamilyOptions(final long handle) {
+    super(handle);
+  }
+
   private static native long getColumnFamilyOptionsFromProps(
       String optString);
 
@@ -795,7 +794,7 @@ public class ColumnFamilyOptions extends RocksObject
       long memtableMemoryBudget);
   private native void setComparatorHandle(long handle, int builtinComparator);
   private native void setComparatorHandle(long optHandle,
-      long comparatorHandle, byte comparatorType);
+      long comparatorHandle, boolean isDirect);
   private native void setMergeOperatorName(long handle, String name);
   private native void setMergeOperator(long handle, long mergeOperatorHandle);
   private native void setCompactionFilterHandle(long handle,

java/src/main/java/org/rocksdb/Comparator.java

@@ -25,10 +25,5 @@ public abstract class Comparator extends AbstractComparator<Slice> {
     return createNewComparator0(nativeParameterHandles[0]);
   }
 
-  @Override
-  final ComparatorType getComparatorType() {
-    return ComparatorType.JAVA_COMPARATOR;
-  }
-
   private native long createNewComparator0(final long comparatorOptionsHandle);
 }

java/src/main/java/org/rocksdb/ComparatorType.java

@@ -1,49 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-enum ComparatorType {
-  JAVA_COMPARATOR((byte)0x0),
-  JAVA_DIRECT_COMPARATOR((byte)0x1),
-  JAVA_NATIVE_COMPARATOR_WRAPPER((byte)0x2);
-
-  private final byte value;
-
-  ComparatorType(final byte value) {
-    this.value = value;
-  }
-
-  /**
-   * <p>Returns the byte value of the enumerations value.</p>
-   *
-   * @return byte representation
-   */
-  byte getValue() {
-    return value;
-  }
-
-  /**
-   * <p>Get the ComparatorType enumeration value by
-   * passing the byte identifier to this method.</p>
-   *
-   * @param byteIdentifier of ComparatorType.
-   *
-   * @return ComparatorType instance.
-   *
-   * @throws IllegalArgumentException if the comparator type for the byteIdentifier
-   *     cannot be found
-   */
-  static ComparatorType getComparatorType(final byte byteIdentifier) {
-    for (final ComparatorType comparatorType : ComparatorType.values()) {
-      if (comparatorType.getValue() == byteIdentifier) {
-        return comparatorType;
-      }
-    }
-
-    throw new IllegalArgumentException(
-        "Illegal value provided for ComparatorType.");
-  }
-}

java/src/main/java/org/rocksdb/DBOptionsInterface.java

@@ -269,10 +269,7 @@ public interface DBOptionsInterface<T extends DBOptionsInterface> {
    * Statistics objects should not be shared between DB instances as
    * it does not use any locks to prevent concurrent updates.</p>
    *
-   * @param statistics The statistics to set
-   *
    * @return the instance of the current object.
-   *
    * @see RocksDB#open(org.rocksdb.Options, String)
    */
   T setStatistics(final Statistics statistics);
@@ -280,9 +277,7 @@ public interface DBOptionsInterface<T extends DBOptionsInterface> {
   /**
    * <p>Returns statistics object.</p>
    *
-   * @return the instance of the statistics object or null if there is no
-   * statistics object.
-   *
+   * @return the instance of the statistics object or null if there is no statistics object.
    * @see #setStatistics(Statistics)
    */
   Statistics statistics();

java/src/main/java/org/rocksdb/DirectComparator.java

@@ -25,11 +25,6 @@ public abstract class DirectComparator extends AbstractComparator<DirectSlice> {
     return createNewDirectComparator0(nativeParameterHandles[0]);
   }
 
-  @Override
-  final ComparatorType getComparatorType() {
-    return ComparatorType.JAVA_DIRECT_COMPARATOR;
-  }
-
   private native long createNewDirectComparator0(
       final long comparatorOptionsHandle);
 }

java/src/main/java/org/rocksdb/NativeComparatorWrapper.java

@@ -1,57 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-/**
- * A simple abstraction to allow a Java class to wrap a custom comparator
- * implemented in C++.
- *
- * The native comparator must directly extend rocksdb::Comparator.
- */
-public abstract class NativeComparatorWrapper
-    extends AbstractComparator<Slice> {
-
-  @Override
-  final ComparatorType getComparatorType() {
-    return ComparatorType.JAVA_NATIVE_COMPARATOR_WRAPPER;
-  }
-
-  @Override
-  public final String name() {
-    throw new IllegalStateException("This should not be called. " +
-        "Implementation is in Native code");
-  }
-
-  @Override
-  public final int compare(final Slice s1, final Slice s2) {
-    throw new IllegalStateException("This should not be called. " +
-        "Implementation is in Native code");
-  }
-
-  @Override
-  public final String findShortestSeparator(final String start, final Slice limit) {
-    throw new IllegalStateException("This should not be called. " +
-        "Implementation is in Native code");
-  }
-
-  @Override
-  public final String findShortSuccessor(final String key) {
-    throw new IllegalStateException("This should not be called. " +
-        "Implementation is in Native code");
-  }
-
-  /**
-   * We override {@link RocksCallbackObject#disposeInternal()}
-   * as disposing of a native rocksd::Comparator extension requires
-   * a slightly different approach as it is not really a RocksCallbackObject
-   */
-  @Override
-  protected void disposeInternal() {
-    disposeInternal(nativeHandle_);
-  }
-
-  private native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/OptimisticTransactionDB.java

@@ -1,175 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import java.util.List;
-
-/**
- * Database with Transaction support.
- */
-public class OptimisticTransactionDB extends RocksDB
-    implements TransactionalDB<OptimisticTransactionOptions> {
-
-  /**
-   * Private constructor.
-   *
-   * @param nativeHandle The native handle of the C++ OptimisticTransactionDB
-   *     object
-   */
-  private OptimisticTransactionDB(final long nativeHandle) {
-    super(nativeHandle);
-  }
-
-  /**
-   * Open an OptimisticTransactionDB similar to
-   * {@link RocksDB#open(Options, String)}.
-   *
-   * @param options {@link org.rocksdb.Options} instance.
-   * @param path the path to the rocksdb.
-   *
-   * @return a {@link OptimisticTransactionDB} instance on success, null if the
-   * specified {@link OptimisticTransactionDB} can not be opened.
-   *
-   * @throws RocksDBException if an error occurs whilst opening the database.
-   */
-  public static OptimisticTransactionDB open(final Options options,
-      final String path) throws RocksDBException {
-    final OptimisticTransactionDB otdb = new OptimisticTransactionDB(open(
-        options.nativeHandle_, path));
-
-    // when non-default Options is used, keeping an Options reference
-    // in RocksDB can prevent Java to GC during the life-time of
-    // the currently-created RocksDB.
-    otdb.storeOptionsInstance(options);
-
-    return otdb;
-  }
-
-  /**
-   * Open an OptimisticTransactionDB similar to
-   * {@link RocksDB#open(DBOptions, String, List, List)}.
-   *
-   * @param dbOptions {@link org.rocksdb.DBOptions} instance.
-   * @param path the path to the rocksdb.
-   * @param columnFamilyDescriptors list of column family descriptors
-   * @param columnFamilyHandles will be filled with ColumnFamilyHandle instances
-   *
-   * @return a {@link OptimisticTransactionDB} instance on success, null if the
-   *     specified {@link OptimisticTransactionDB} can not be opened.
-   *
-   * @throws RocksDBException if an error occurs whilst opening the database.
-   */
-  public static OptimisticTransactionDB open(final DBOptions dbOptions,
-      final String path,
-      final List<ColumnFamilyDescriptor> columnFamilyDescriptors,
-      final List<ColumnFamilyHandle> columnFamilyHandles)
-      throws RocksDBException {
-
-    final byte[][] cfNames = new byte[columnFamilyDescriptors.size()][];
-    final long[] cfOptionHandles = new long[columnFamilyDescriptors.size()];
-    for (int i = 0; i < columnFamilyDescriptors.size(); i++) {
-      final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors
-          .get(i);
-      cfNames[i] = cfDescriptor.columnFamilyName();
-      cfOptionHandles[i] = cfDescriptor.columnFamilyOptions().nativeHandle_;
-    }
-
-    final long[] handles = open(dbOptions.nativeHandle_, path, cfNames,
-        cfOptionHandles);
-    final OptimisticTransactionDB otdb =
-        new OptimisticTransactionDB(handles[0]);
-
-    // when non-default Options is used, keeping an Options reference
-    // in RocksDB can prevent Java to GC during the life-time of
-    // the currently-created RocksDB.
-    otdb.storeOptionsInstance(dbOptions);
-
-    for (int i = 1; i < handles.length; i++) {
-      columnFamilyHandles.add(new ColumnFamilyHandle(otdb, handles[i]));
-    }
-
-    return otdb;
-  }
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions) {
-    return new Transaction(this, beginTransaction(nativeHandle_,
-        writeOptions.nativeHandle_));
-  }
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions,
-      final OptimisticTransactionOptions optimisticTransactionOptions) {
-    return new Transaction(this, beginTransaction(nativeHandle_,
-        writeOptions.nativeHandle_,
-        optimisticTransactionOptions.nativeHandle_));
-  }
-
-  // TODO(AR) consider having beingTransaction(... oldTransaction) set a
-  // reference count inside Transaction, so that we can always call
-  // Transaction#close but the object is only disposed when there are as many
-  // closes as beginTransaction. Makes the try-with-resources paradigm easier for
-  // java developers
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions,
-      final Transaction oldTransaction) {
-    final long jtxn_handle = beginTransaction_withOld(nativeHandle_,
-        writeOptions.nativeHandle_, oldTransaction.nativeHandle_);
-
-    // RocksJava relies on the assumption that
-    // we do not allocate a new Transaction object
-    // when providing an old_txn
-    assert(jtxn_handle == oldTransaction.nativeHandle_);
-
-    return oldTransaction;
-  }
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions,
-      final OptimisticTransactionOptions optimisticTransactionOptions,
-      final Transaction oldTransaction) {
-    final long jtxn_handle = beginTransaction_withOld(nativeHandle_,
-        writeOptions.nativeHandle_, optimisticTransactionOptions.nativeHandle_,
-        oldTransaction.nativeHandle_);
-
-    // RocksJava relies on the assumption that
-    // we do not allocate a new Transaction object
-    // when providing an old_txn
-    assert(jtxn_handle == oldTransaction.nativeHandle_);
-
-    return oldTransaction;
-  }
-
-  /**
-   * Get the underlying database that was opened.
-   *
-   * @return The underlying database that was opened.
-   */
-  public RocksDB getBaseDB() {
-    final RocksDB db = new RocksDB(getBaseDB(nativeHandle_));
-    db.disOwnNativeHandle();
-    return db;
-  }
-
-  protected static native long open(final long optionsHandle,
-      final String path) throws RocksDBException;
-  protected static native long[] open(final long handle, final String path,
-      final byte[][] columnFamilyNames, final long[] columnFamilyOptions);
-  private native long beginTransaction(final long handle,
-      final long writeOptionsHandle);
-  private native long beginTransaction(final long handle,
-      final long writeOptionsHandle,
-      final long optimisticTransactionOptionsHandle);
-  private native long beginTransaction_withOld(final long handle,
-      final long writeOptionsHandle, final long oldTransactionHandle);
-  private native long beginTransaction_withOld(final long handle,
-      final long writeOptionsHandle,
-      final long optimisticTransactionOptionsHandle,
-      final long oldTransactionHandle);
-  private native long getBaseDB(final long handle);
-  @Override protected final native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/OptimisticTransactionOptions.java

@@ -1,53 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-public class OptimisticTransactionOptions extends RocksObject
-    implements TransactionalOptions {
-
-  public OptimisticTransactionOptions() {
-    super(newOptimisticTransactionOptions());
-  }
-
-  @Override
-  public boolean isSetSnapshot() {
-    assert(isOwningHandle());
-    return isSetSnapshot(nativeHandle_);
-  }
-
-  @Override
-  public OptimisticTransactionOptions setSetSnapshot(
-      final boolean setSnapshot) {
-    assert(isOwningHandle());
-    setSetSnapshot(nativeHandle_, setSnapshot);
-    return this;
-  }
-
-  /**
-   * Should be set if the DB has a non-default comparator.
-   * See comment in
-   * {@link WriteBatchWithIndex#WriteBatchWithIndex(AbstractComparator, int, boolean)}
-   * constructor.
-   *
-   * @param comparator The comparator to use for the transaction.
-   *
-   * @return this OptimisticTransactionOptions instance
-   */
-  public OptimisticTransactionOptions setComparator(
-      final AbstractComparator<? extends AbstractSlice<?>> comparator) {
-    assert(isOwningHandle());
-    setComparator(nativeHandle_, comparator.nativeHandle_);
-    return this;
-  }
-
-  private native static long newOptimisticTransactionOptions();
-  private native boolean isSetSnapshot(final long handle);
-  private native void setSetSnapshot(final long handle,
-      final boolean setSnapshot);
-  private native void setComparator(final long handle,
-      final long comparatorHandle);
-  @Override protected final native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/Options.java

@@ -170,7 +170,7 @@ public class Options extends RocksObject
       final AbstractComparator<? extends AbstractSlice<?>> comparator) {
     assert(isOwningHandle());
     setComparatorHandle(nativeHandle_, comparator.nativeHandle_,
-            comparator.getComparatorType().getValue());
+            comparator instanceof DirectComparator);
     comparator_ = comparator;
     return this;
   }
@@ -1734,7 +1734,7 @@ public class Options extends RocksObject
       long memtableMemoryBudget);
   private native void setComparatorHandle(long handle, int builtinComparator);
   private native void setComparatorHandle(long optHandle,
-      long comparatorHandle, byte comparatorType);
+      long comparatorHandle, boolean isDirect);
   private native void setMergeOperatorName(
       long handle, String name);
   private native void setMergeOperator(

java/src/main/java/org/rocksdb/RateLimiter.java

@@ -12,11 +12,8 @@ package org.rocksdb;
  * @since 3.10.0
  */
 public class RateLimiter extends RocksObject {
-  public static final long DEFAULT_REFILL_PERIOD_MICROS = 100 * 1000;
-  public static final int DEFAULT_FAIRNESS = 10;
-  public static final RateLimiterMode DEFAULT_MODE =
-      RateLimiterMode.WRITES_ONLY;
-  public static final boolean DEFAULT_AUTOTUNE = false;
+  private static final long DEFAULT_REFILL_PERIOD_MICROS = (100 * 1000);
+  private static final int DEFAULT_FAIRNESS = 10;
 
   /**
    * RateLimiter constructor
@@ -24,129 +21,36 @@ public class RateLimiter extends RocksObject {
    * @param rateBytesPerSecond this is the only parameter you want to set
    *     most of the time. It controls the total write rate of compaction
    *     and flush in bytes per second. Currently, RocksDB does not enforce
-   *     rate limit for anything other than flush and compaction, e.g. write to
-   *     WAL.
-   */
-  public RateLimiter(final long rateBytesPerSecond) {
-    this(rateBytesPerSecond, DEFAULT_REFILL_PERIOD_MICROS, DEFAULT_FAIRNESS,
-        DEFAULT_MODE, DEFAULT_AUTOTUNE);
-  }
-
-  /**
-   * RateLimiter constructor
-   *
-   * @param rateBytesPerSecond this is the only parameter you want to set
-   *     most of the time. It controls the total write rate of compaction
-   *     and flush in bytes per second. Currently, RocksDB does not enforce
-   *     rate limit for anything other than flush and compaction, e.g. write to
-   *     WAL.
-   * @param refillPeriodMicros this controls how often tokens are refilled. For
-   *     example,
+   *     rate limit for anything other than flush and compaction, e.g. write to WAL.
+   * @param refillPeriodMicros this controls how often tokens are refilled. For example,
    *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
-   *     100ms, then 1MB is refilled every 100ms internally. Larger value can
-   *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
-   */
-  public RateLimiter(final long rateBytesPerSecond,
-      final long refillPeriodMicros) {
-    this(rateBytesPerSecond, refillPeriodMicros, DEFAULT_FAIRNESS, DEFAULT_MODE,
-        DEFAULT_AUTOTUNE);
-  }
-
-  /**
-   * RateLimiter constructor
-   *
-   * @param rateBytesPerSecond this is the only parameter you want to set
-   *     most of the time. It controls the total write rate of compaction
-   *     and flush in bytes per second. Currently, RocksDB does not enforce
-   *     rate limit for anything other than flush and compaction, e.g. write to
-   *     WAL.
-   * @param refillPeriodMicros this controls how often tokens are refilled. For
-   *     example,
-   *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
-   *     100ms, then 1MB is refilled every 100ms internally. Larger value can
-   *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
+   *     100ms, then 1MB is refilled every 100ms internally. Larger value can lead to
+   *     burstier writes while smaller value introduces more CPU overhead.
+   *     The default should work for most cases.
    * @param fairness RateLimiter accepts high-pri requests and low-pri requests.
-   *     A low-pri request is usually blocked in favor of hi-pri request.
-   *     Currently, RocksDB assigns low-pri to request from compaction and
-   *     high-pri to request from flush. Low-pri requests can get blocked if
-   *     flush requests come in continuously. This fairness parameter grants
-   *     low-pri requests permission by fairness chance even though high-pri
-   *     requests exist to avoid starvation.
+   *     A low-pri request is usually blocked in favor of hi-pri request. Currently,
+   *     RocksDB assigns low-pri to request from compaction and high-pri to request
+   *     from flush. Low-pri requests can get blocked if flush requests come in
+   *     continuously. This fairness parameter grants low-pri requests permission by
+   *     fairness chance even though high-pri requests exist to avoid starvation.
    *     You should be good by leaving it at default 10.
    */
   public RateLimiter(final long rateBytesPerSecond,
       final long refillPeriodMicros, final int fairness) {
-    this(rateBytesPerSecond, refillPeriodMicros, fairness, DEFAULT_MODE,
-        DEFAULT_AUTOTUNE);
-  }
-
-  /**
-   * RateLimiter constructor
-   *
-   * @param rateBytesPerSecond this is the only parameter you want to set
-   *     most of the time. It controls the total write rate of compaction
-   *     and flush in bytes per second. Currently, RocksDB does not enforce
-   *     rate limit for anything other than flush and compaction, e.g. write to
-   *     WAL.
-   * @param refillPeriodMicros this controls how often tokens are refilled. For
-   *     example,
-   *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
-   *     100ms, then 1MB is refilled every 100ms internally. Larger value can
-   *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
-   * @param fairness RateLimiter accepts high-pri requests and low-pri requests.
-   *     A low-pri request is usually blocked in favor of hi-pri request.
-   *     Currently, RocksDB assigns low-pri to request from compaction and
-   *     high-pri to request from flush. Low-pri requests can get blocked if
-   *     flush requests come in continuously. This fairness parameter grants
-   *     low-pri requests permission by fairness chance even though high-pri
-   *     requests exist to avoid starvation.
-   *     You should be good by leaving it at default 10.
-   * @param rateLimiterMode indicates which types of operations count against
-   *     the limit.
-   */
-  public RateLimiter(final long rateBytesPerSecond,
-      final long refillPeriodMicros, final int fairness,
-      final RateLimiterMode rateLimiterMode) {
-    this(rateBytesPerSecond, refillPeriodMicros, fairness, rateLimiterMode,
-        DEFAULT_AUTOTUNE);
-  }
-
-  /**
-   * RateLimiter constructor
-   *
-   * @param rateBytesPerSecond this is the only parameter you want to set
-   *     most of the time. It controls the total write rate of compaction
-   *     and flush in bytes per second. Currently, RocksDB does not enforce
-   *     rate limit for anything other than flush and compaction, e.g. write to
-   *     WAL.
-   * @param refillPeriodMicros this controls how often tokens are refilled. For
-   *     example,
-   *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
-   *     100ms, then 1MB is refilled every 100ms internally. Larger value can
-   *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
-   * @param fairness RateLimiter accepts high-pri requests and low-pri requests.
-   *     A low-pri request is usually blocked in favor of hi-pri request.
-   *     Currently, RocksDB assigns low-pri to request from compaction and
-   *     high-pri to request from flush. Low-pri requests can get blocked if
-   *     flush requests come in continuously. This fairness parameter grants
-   *     low-pri requests permission by fairness chance even though high-pri
-   *     requests exist to avoid starvation.
-   *     You should be good by leaving it at default 10.
-   * @param rateLimiterMode indicates which types of operations count against
-   *     the limit.
-   * @param autoTune Enables dynamic adjustment of rate limit within the range
-   *     {@code [rate_bytes_per_sec / 20, rate_bytes_per_sec]}, according to
-   *     the recent demand for background I/O.
-   */
-  public RateLimiter(final long rateBytesPerSecond,
-      final long refillPeriodMicros, final int fairness,
-      final RateLimiterMode rateLimiterMode, final boolean autoTune) {
     super(newRateLimiterHandle(rateBytesPerSecond,
-        refillPeriodMicros, fairness, rateLimiterMode.getValue(), autoTune));
+        refillPeriodMicros, fairness));
+  }
+
+  /**
+   * RateLimiter constructor
+   *
+   * @param rateBytesPerSecond this is the only parameter you want to set
+   *     most of the time. It controls the total write rate of compaction
+   *     and flush in bytes per second. Currently, RocksDB does not enforce
+   *     rate limit for anything other than flush and compaction, e.g. write to WAL.
+   */
+  public RateLimiter(final long rateBytesPerSecond) {
+    this(rateBytesPerSecond, DEFAULT_REFILL_PERIOD_MICROS, DEFAULT_FAIRNESS);
   }
 
   /**
@@ -160,16 +64,6 @@ public class RateLimiter extends RocksObject {
     setBytesPerSecond(nativeHandle_, bytesPerSecond);
   }
 
-  /**
-   * Returns the bytes per second.
-   *
-   * @return bytes per second.
-   */
-  public long getBytesPerSecond() {
-    assert(isOwningHandle());
-    return getBytesPerSecond(nativeHandle_);
-  }
-
   /**
    * <p>Request for token to write bytes. If this request can not be satisfied,
    * the call is blocked. Caller is responsible to make sure
@@ -213,13 +107,11 @@ public class RateLimiter extends RocksObject {
   }
 
   private static native long newRateLimiterHandle(final long rateBytesPerSecond,
-      final long refillPeriodMicros, final int fairness,
-      final byte rateLimiterMode, final boolean autoTune);
+      final long refillPeriodMicros, final int fairness);
   @Override protected final native void disposeInternal(final long handle);
 
   private native void setBytesPerSecond(final long handle,
       final long bytesPerSecond);
-  private native long getBytesPerSecond(final long handle);
   private native void request(final long handle, final long bytes);
   private native long getSingleBurstBytes(final long handle);
   private native long getTotalBytesThrough(final long handle);

java/src/main/java/org/rocksdb/RateLimiterMode.java

@@ -1,52 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-/**
- * Mode for {@link RateLimiter#RateLimiter(long, long, int, RateLimiterMode)}.
- */
-public enum RateLimiterMode {
-  READS_ONLY((byte)0x0),
-  WRITES_ONLY((byte)0x1),
-  ALL_IO((byte)0x2);
-
-  private final byte value;
-
-  RateLimiterMode(final byte value) {
-    this.value = value;
-  }
-
-  /**
-   * <p>Returns the byte value of the enumerations value.</p>
-   *
-   * @return byte representation
-   */
-  public byte getValue() {
-    return value;
-  }
-
-  /**
-   * <p>Get the RateLimiterMode enumeration value by
-   * passing the byte identifier to this method.</p>
-   *
-   * @param byteIdentifier of RateLimiterMode.
-   *
-   * @return AccessHint instance.
-   *
-   * @throws IllegalArgumentException if the access hint for the byteIdentifier
-   *     cannot be found
-   */
-  public static RateLimiterMode getRateLimiterMode(final byte byteIdentifier) {
-    for (final RateLimiterMode rateLimiterMode : RateLimiterMode.values()) {
-      if (rateLimiterMode.getValue() == byteIdentifier) {
-        return rateLimiterMode;
-      }
-    }
-
-    throw new IllegalArgumentException(
-        "Illegal value provided for RateLimiterMode.");
-  }
-}

java/src/main/java/org/rocksdb/RocksDB.java

@@ -435,7 +435,7 @@ public class RocksDB extends RocksObject {
         path));
   }
 
-  protected void storeOptionsInstance(DBOptionsInterface options) {
+  private void storeOptionsInstance(DBOptionsInterface options) {
     options_ = options;
   }
 
@@ -1683,7 +1683,7 @@ public class RocksDB extends RocksObject {
    * @return The handle of the default column family
    */
   public ColumnFamilyHandle getDefaultColumnFamily() {
-    final ColumnFamilyHandle cfHandle = new ColumnFamilyHandle(this,
+    ColumnFamilyHandle cfHandle = new ColumnFamilyHandle(this,
         getDefaultColumnFamily(nativeHandle_));
     cfHandle.disOwnNativeHandle();
     return cfHandle;
@@ -2359,9 +2359,8 @@ public class RocksDB extends RocksObject {
       final long[] columnFamilyHandles, final long readOptHandle)
       throws RocksDBException;
   protected native long getSnapshot(long nativeHandle);
-  protected native void releaseSnapshot(
-      long nativeHandle, long snapshotHandle);
-  @Override protected native void disposeInternal(final long handle);
+  protected native void releaseSnapshot(long nativeHandle, long snapshotHandle);
+  @Override protected final native void disposeInternal(final long handle);
   private native long getDefaultColumnFamily(long handle);
   private native long createColumnFamily(final long handle,
       final byte[] columnFamilyName, final long columnFamilyOptions)

java/src/main/java/org/rocksdb/Snapshot.java

@@ -11,10 +11,6 @@ package org.rocksdb;
 public class Snapshot extends RocksObject {
   Snapshot(final long nativeHandle) {
     super(nativeHandle);
-
-    // The pointer to the snapshot is always released
-    // by the database instance.
-    disOwnNativeHandle();
   }
 
   /**
@@ -24,17 +20,17 @@ public class Snapshot extends RocksObject {
    *     this snapshot.
    */
   public long getSequenceNumber() {
+    assert(isOwningHandle());
     return getSequenceNumber(nativeHandle_);
   }
 
+  /**
+   * Dont release C++ Snapshot pointer. The pointer
+   * to the snapshot is released by the database
+   * instance.
+   */
   @Override
   protected final void disposeInternal(final long handle) {
-    /**
-     * Nothing to release, we never own the pointer for a
-     * Snapshot. The pointer
-     * to the snapshot is released by the database
-     * instance.
-     */
   }
 
   private native long getSequenceNumber(long handle);

java/src/main/java/org/rocksdb/SstFileWriter.java

@@ -31,7 +31,7 @@ public class SstFileWriter extends RocksObject {
       final AbstractComparator<? extends AbstractSlice<?>> comparator) {
     super(newSstFileWriter(
         envOptions.nativeHandle_, options.nativeHandle_, comparator.nativeHandle_,
-        comparator.getComparatorType().getValue()));
+        comparator instanceof DirectComparator));
   }
 
   /**
@@ -225,7 +225,7 @@ public void put(final byte[] key, final byte[] value)
 
   private native static long newSstFileWriter(
       final long envOptionsHandle, final long optionsHandle,
-      final long userComparatorHandle, final byte comparatorType);
+      final long userComparatorHandle, final boolean isDirect);
 
   private native static long newSstFileWriter(final long envOptionsHandle,
       final long optionsHandle);

java/src/main/java/org/rocksdb/Statistics.java

@@ -117,8 +117,6 @@ public class Statistics extends RocksObject {
 
   /**
    * Resets all ticker and histogram stats.
-   *
-   * @throws RocksDBException if an error occurs when resetting the statistics.
    */
   public void reset() throws RocksDBException {
     assert(isOwningHandle());
@@ -128,7 +126,6 @@ public class Statistics extends RocksObject {
   /**
    * String representation of the statistic object.
    */
-  @Override
   public String toString() {
     assert(isOwningHandle());
     return toString(nativeHandle_);

java/src/main/java/org/rocksdb/Status.java

@@ -87,15 +87,6 @@ public class Status {
       throw new IllegalArgumentException(
           "Illegal value provided for Code (" + value + ").");
     }
-
-    /**
-     * Returns the byte value of the enumerations value.
-     *
-     * @return byte representation
-     */
-    public byte getValue() {
-      return value;
-    }
   }
 
   // should stay in sync with /include/rocksdb/status.h:SubCode and /java/rocksjni/portal.h:toJavaStatusSubCode
@@ -125,14 +116,5 @@ public class Status {
       throw new IllegalArgumentException(
           "Illegal value provided for SubCode (" + value + ").");
     }
-
-    /**
-     * Returns the byte value of the enumerations value.
-     *
-     * @return byte representation
-     */
-    public byte getValue() {
-      return value;
-    }
   }
 }

java/src/main/java/org/rocksdb/TransactionDB.java

@@ -1,354 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Database with Transaction support
- */
-public class TransactionDB extends RocksDB
-    implements TransactionalDB<TransactionOptions> {
-
-  private TransactionDBOptions transactionDbOptions_;
-
-  /**
-   * Private constructor.
-   *
-   * @param nativeHandle The native handle of the C++ TransactionDB object
-   */
-  private TransactionDB(final long nativeHandle) {
-    super(nativeHandle);
-  }
-
-  /**
-   * Open a TransactionDB, similar to {@link RocksDB#open(Options, String)}.
-   *
-   * @param options {@link org.rocksdb.Options} instance.
-   * @param transactionDbOptions {@link org.rocksdb.TransactionDBOptions}
-   *     instance.
-   * @param path the path to the rocksdb.
-   *
-   * @return a {@link TransactionDB} instance on success, null if the specified
-   *     {@link TransactionDB} can not be opened.
-   *
-   * @throws RocksDBException if an error occurs whilst opening the database.
-   */
-  public static TransactionDB open(final Options options,
-      final TransactionDBOptions transactionDbOptions, final String path)
-      throws RocksDBException {
-    final TransactionDB tdb = new TransactionDB(open(options.nativeHandle_,
-        transactionDbOptions.nativeHandle_, path));
-
-    // when non-default Options is used, keeping an Options reference
-    // in RocksDB can prevent Java to GC during the life-time of
-    // the currently-created RocksDB.
-    tdb.storeOptionsInstance(options);
-    tdb.storeTransactionDbOptions(transactionDbOptions);
-
-    return tdb;
-  }
-
-  /**
-   * Open a TransactionDB, similar to
-   * {@link RocksDB#open(DBOptions, String, List, List)}.
-   *
-   * @param dbOptions {@link org.rocksdb.DBOptions} instance.
-   * @param transactionDbOptions {@link org.rocksdb.TransactionDBOptions}
-   *     instance.
-   * @param path the path to the rocksdb.
-   * @param columnFamilyDescriptors list of column family descriptors
-   * @param columnFamilyHandles will be filled with ColumnFamilyHandle instances
-   *
-   * @return a {@link TransactionDB} instance on success, null if the specified
-   *     {@link TransactionDB} can not be opened.
-   *
-   * @throws RocksDBException if an error occurs whilst opening the database.
-   */
-  public static TransactionDB open(final DBOptions dbOptions,
-      final TransactionDBOptions transactionDbOptions,
-      final String path,
-      final List<ColumnFamilyDescriptor> columnFamilyDescriptors,
-      final List<ColumnFamilyHandle> columnFamilyHandles)
-      throws RocksDBException {
-
-    final byte[][] cfNames = new byte[columnFamilyDescriptors.size()][];
-    final long[] cfOptionHandles = new long[columnFamilyDescriptors.size()];
-    for (int i = 0; i < columnFamilyDescriptors.size(); i++) {
-      final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors
-          .get(i);
-      cfNames[i] = cfDescriptor.columnFamilyName();
-      cfOptionHandles[i] = cfDescriptor.columnFamilyOptions().nativeHandle_;
-    }
-
-    final long[] handles = open(dbOptions.nativeHandle_,
-        transactionDbOptions.nativeHandle_, path, cfNames, cfOptionHandles);
-    final TransactionDB tdb = new TransactionDB(handles[0]);
-
-    // when non-default Options is used, keeping an Options reference
-    // in RocksDB can prevent Java to GC during the life-time of
-    // the currently-created RocksDB.
-    tdb.storeOptionsInstance(dbOptions);
-    tdb.storeTransactionDbOptions(transactionDbOptions);
-
-    for (int i = 1; i < handles.length; i++) {
-      columnFamilyHandles.add(new ColumnFamilyHandle(tdb, handles[i]));
-    }
-
-    return tdb;
-  }
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions) {
-    return new Transaction(this, beginTransaction(nativeHandle_,
-        writeOptions.nativeHandle_));
-  }
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions,
-      final TransactionOptions transactionOptions) {
-    return new Transaction(this, beginTransaction(nativeHandle_,
-        writeOptions.nativeHandle_, transactionOptions.nativeHandle_));
-  }
-
-  // TODO(AR) consider having beingTransaction(... oldTransaction) set a
-  // reference count inside Transaction, so that we can always call
-  // Transaction#close but the object is only disposed when there are as many
-  // closes as beginTransaction. Makes the try-with-resources paradigm easier for
-  // java developers
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions,
-      final Transaction oldTransaction) {
-    final long jtxnHandle = beginTransaction_withOld(nativeHandle_,
-        writeOptions.nativeHandle_, oldTransaction.nativeHandle_);
-
-    // RocksJava relies on the assumption that
-    // we do not allocate a new Transaction object
-    // when providing an old_txn
-    assert(jtxnHandle == oldTransaction.nativeHandle_);
-
-    return oldTransaction;
-  }
-
-  @Override
-  public Transaction beginTransaction(final WriteOptions writeOptions,
-      final TransactionOptions transactionOptions,
-      final Transaction oldTransaction) {
-    final long jtxn_handle = beginTransaction_withOld(nativeHandle_,
-        writeOptions.nativeHandle_, transactionOptions.nativeHandle_,
-        oldTransaction.nativeHandle_);
-
-    // RocksJava relies on the assumption that
-    // we do not allocate a new Transaction object
-    // when providing an old_txn
-    assert(jtxn_handle == oldTransaction.nativeHandle_);
-
-    return oldTransaction;
-  }
-
-  public Transaction getTransactionByName(final String transactionName) {
-    final long jtxnHandle = getTransactionByName(nativeHandle_, transactionName);
-    if(jtxnHandle == 0) {
-      return null;
-    }
-
-    final Transaction txn = new Transaction(this, jtxnHandle);
-
-    // this instance doesn't own the underlying C++ object
-    txn.disOwnNativeHandle();
-
-    return txn;
-  }
-
-  public List<Transaction> getAllPreparedTransactions() {
-    final long[] jtxnHandles = getAllPreparedTransactions(nativeHandle_);
-
-    final List<Transaction> txns = new ArrayList<>();
-    for(final long jtxnHandle : jtxnHandles) {
-      final Transaction txn = new Transaction(this, jtxnHandle);
-
-      // this instance doesn't own the underlying C++ object
-      txn.disOwnNativeHandle();
-
-      txns.add(txn);
-    }
-    return txns;
-  }
-
-  public static class KeyLockInfo {
-    private final String key;
-    private final long[] transactionIDs;
-    private final boolean exclusive;
-
-    public KeyLockInfo(final String key, final long transactionIDs[],
-        final boolean exclusive) {
-      this.key = key;
-      this.transactionIDs = transactionIDs;
-      this.exclusive = exclusive;
-    }
-
-    /**
-     * Get the key.
-     *
-     * @return the key
-     */
-    public String getKey() {
-      return key;
-    }
-
-    /**
-     * Get the Transaction IDs.
-     *
-     * @return the Transaction IDs.
-     */
-    public long[] getTransactionIDs() {
-      return transactionIDs;
-    }
-
-    /**
-     * Get the Lock status.
-     *
-     * @return true if the lock is exclusive, false if the lock is shared.
-     */
-    public boolean isExclusive() {
-      return exclusive;
-    }
-  }
-
-  /**
-   * Returns map of all locks held.
-   *
-   * @return a map of all the locks held.
-   */
-  public Map<Long, KeyLockInfo> getLockStatusData() {
-    return getLockStatusData(nativeHandle_);
-  }
-
-  /**
-   * Called from C++ native method {@link #getDeadlockInfoBuffer(long)}
-   * to construct a DeadlockInfo object.
-   *
-   * @param transactionID The transaction id
-   * @param columnFamilyId The id of the {@link ColumnFamilyHandle}
-   * @param waitingKey the key that we are waiting on
-   * @param exclusive true if the lock is exclusive, false if the lock is shared
-   *
-   * @return The waiting transactions
-   */
-  private DeadlockInfo newDeadlockInfo(
-      final long transactionID, final long columnFamilyId,
-      final String waitingKey, final boolean exclusive) {
-    return new DeadlockInfo(transactionID, columnFamilyId,
-        waitingKey, exclusive);
-  }
-
-  public static class DeadlockInfo {
-    private final long transactionID;
-    private final long columnFamilyId;
-    private final String waitingKey;
-    private final boolean exclusive;
-
-    private DeadlockInfo(final long transactionID, final long columnFamilyId,
-      final String waitingKey, final boolean exclusive) {
-      this.transactionID = transactionID;
-      this.columnFamilyId = columnFamilyId;
-      this.waitingKey = waitingKey;
-      this.exclusive = exclusive;
-    }
-
-    /**
-     * Get the Transaction ID.
-     *
-     * @return the transaction ID
-     */
-    public long getTransactionID() {
-      return transactionID;
-    }
-
-    /**
-     * Get the Column Family ID.
-     *
-     * @return The column family ID
-     */
-    public long getColumnFamilyId() {
-      return columnFamilyId;
-    }
-
-    /**
-     * Get the key that we are waiting on.
-     *
-     * @return the key that we are waiting on
-     */
-    public String getWaitingKey() {
-      return waitingKey;
-    }
-
-    /**
-     * Get the Lock status.
-     *
-     * @return true if the lock is exclusive, false if the lock is shared.
-     */
-    public boolean isExclusive() {
-      return exclusive;
-    }
-  }
-
-  public static class DeadlockPath {
-    final DeadlockInfo[] path;
-    final boolean limitExceeded;
-
-    public DeadlockPath(final DeadlockInfo[] path, final boolean limitExceeded) {
-      this.path = path;
-      this.limitExceeded = limitExceeded;
-    }
-
-    public boolean isEmpty() {
-      return path.length == 0 && !limitExceeded;
-    }
-  }
-
-  public DeadlockPath[] getDeadlockInfoBuffer() {
-    return getDeadlockInfoBuffer(nativeHandle_);
-  }
-
-  public void setDeadlockInfoBufferSize(final int targetSize) {
-    setDeadlockInfoBufferSize(nativeHandle_, targetSize);
-  }
-
-  private void storeTransactionDbOptions(
-      final TransactionDBOptions transactionDbOptions) {
-    this.transactionDbOptions_ = transactionDbOptions;
-  }
-
-  private static native long open(final long optionsHandle,
-      final long transactionDbOptionsHandle, final String path)
-      throws RocksDBException;
-  private static native long[] open(final long dbOptionsHandle,
-      final long transactionDbOptionsHandle, final String path,
-      final byte[][] columnFamilyNames, final long[] columnFamilyOptions);
-  private native long beginTransaction(final long handle,
-      final long writeOptionsHandle);
-  private native long beginTransaction(final long handle,
-      final long writeOptionsHandle, final long transactionOptionsHandle);
-  private native long beginTransaction_withOld(final long handle,
-      final long writeOptionsHandle, final long oldTransactionHandle);
-  private native long beginTransaction_withOld(final long handle,
-      final long writeOptionsHandle, final long transactionOptionsHandle,
-      final long oldTransactionHandle);
-  private native long getTransactionByName(final long handle,
-      final String name);
-  private native long[] getAllPreparedTransactions(final long handle);
-  private native Map<Long, KeyLockInfo> getLockStatusData(
-      final long handle);
-  private native DeadlockPath[] getDeadlockInfoBuffer(final long handle);
-  private native void setDeadlockInfoBufferSize(final long handle,
-      final int targetSize);
-  @Override protected final native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/TransactionDBOptions.java

@@ -1,217 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-public class TransactionDBOptions extends RocksObject {
-
-  public TransactionDBOptions() {
-    super(newTransactionDBOptions());
-  }
-
-  /**
-   * Specifies the maximum number of keys that can be locked at the same time
-   * per column family.
-   *
-   * If the number of locked keys is greater than {@link #getMaxNumLocks()},
-   * transaction writes (or GetForUpdate) will return an error.
-   *
-   * @return The maximum number of keys that can be locked
-   */
-  public long getMaxNumLocks() {
-    assert(isOwningHandle());
-    return getMaxNumLocks(nativeHandle_);
-  }
-
-  /**
-   * Specifies the maximum number of keys that can be locked at the same time
-   * per column family.
-   *
-   * If the number of locked keys is greater than {@link #getMaxNumLocks()},
-   * transaction writes (or GetForUpdate) will return an error.
-   *
-   * @param maxNumLocks The maximum number of keys that can be locked;
-   *     If this value is not positive, no limit will be enforced.
-   *
-   * @return this TransactionDBOptions instance
-   */
-  public TransactionDBOptions setMaxNumLocks(final long maxNumLocks) {
-    assert(isOwningHandle());
-    setMaxNumLocks(nativeHandle_, maxNumLocks);
-    return this;
-  }
-
-  /**
-   * The number of sub-tables per lock table (per column family)
-   *
-   * @return The number of sub-tables
-   */
-  public long getNumStripes() {
-    assert(isOwningHandle());
-    return getNumStripes(nativeHandle_);
-  }
-
-  /**
-   * Increasing this value will increase the concurrency by dividing the lock
-   * table (per column family) into more sub-tables, each with their own
-   * separate mutex.
-   *
-   * Default: 16
-   *
-   * @param numStripes The number of sub-tables
-   *
-   * @return this TransactionDBOptions instance
-   */
-  public TransactionDBOptions setNumStripes(final long numStripes) {
-    assert(isOwningHandle());
-    setNumStripes(nativeHandle_, numStripes);
-    return this;
-  }
-
-  /**
-   * The default wait timeout in milliseconds when
-   * a transaction attempts to lock a key if not specified by
-   * {@link TransactionOptions#setLockTimeout(long)}
-   *
-   * If 0, no waiting is done if a lock cannot instantly be acquired.
-   * If negative, there is no timeout.
-   *
-   * @return the default wait timeout in milliseconds
-   */
-  public long getTransactionLockTimeout() {
-    assert(isOwningHandle());
-    return getTransactionLockTimeout(nativeHandle_);
-  }
-
-  /**
-   * If positive, specifies the default wait timeout in milliseconds when
-   * a transaction attempts to lock a key if not specified by
-   * {@link TransactionOptions#setLockTimeout(long)}
-   *
-   * If 0, no waiting is done if a lock cannot instantly be acquired.
-   * If negative, there is no timeout. Not using a timeout is not recommended
-   * as it can lead to deadlocks.  Currently, there is no deadlock-detection to
-   * recover from a deadlock.
-   *
-   * Default: 1000
-   *
-   * @param transactionLockTimeout the default wait timeout in milliseconds
-   *
-   * @return this TransactionDBOptions instance
-   */
-  public TransactionDBOptions setTransactionLockTimeout(
-      final long transactionLockTimeout) {
-    assert(isOwningHandle());
-    setTransactionLockTimeout(nativeHandle_, transactionLockTimeout);
-    return this;
-  }
-
-  /**
-   * The wait timeout in milliseconds when writing a key
-   * OUTSIDE of a transaction (ie by calling {@link RocksDB#put},
-   * {@link RocksDB#merge}, {@link RocksDB#remove} or {@link RocksDB#write}
-   * directly).
-   *
-   * If 0, no waiting is done if a lock cannot instantly be acquired.
-   * If negative, there is no timeout and will block indefinitely when acquiring
-   * a lock.
-   *
-   * @return the timeout in milliseconds when writing a key OUTSIDE of a
-   *     transaction
-   */
-  public long getDefaultLockTimeout() {
-    assert(isOwningHandle());
-    return getDefaultLockTimeout(nativeHandle_);
-  }
-
-  /**
-   * If positive, specifies the wait timeout in milliseconds when writing a key
-   * OUTSIDE of a transaction (ie by calling {@link RocksDB#put},
-   * {@link RocksDB#merge}, {@link RocksDB#remove} or {@link RocksDB#write}
-   * directly).
-   *
-   * If 0, no waiting is done if a lock cannot instantly be acquired.
-   * If negative, there is no timeout and will block indefinitely when acquiring
-   * a lock.
-   *
-   * Not using a timeout can lead to deadlocks. Currently, there
-   * is no deadlock-detection to recover from a deadlock.  While DB writes
-   * cannot deadlock with other DB writes, they can deadlock with a transaction.
-   * A negative timeout should only be used if all transactions have a small
-   * expiration set.
-   *
-   * Default: 1000
-   *
-   * @param defaultLockTimeout the timeout in milliseconds when writing a key
-   *     OUTSIDE of a transaction
-   * @return this TransactionDBOptions instance
-   */
-   public TransactionDBOptions setDefaultLockTimeout(
-       final long defaultLockTimeout) {
-     assert(isOwningHandle());
-     setDefaultLockTimeout(nativeHandle_, defaultLockTimeout);
-     return this;
-   }
-
-//  /**
-//   * If set, the {@link TransactionDB} will use this implementation of a mutex
-//   * and condition variable for all transaction locking instead of the default
-//   * mutex/condvar implementation.
-//   *
-//   * @param transactionDbMutexFactory the mutex factory for the transactions
-//   *
-//   * @return this TransactionDBOptions instance
-//   */
-//  public TransactionDBOptions setCustomMutexFactory(
-//      final TransactionDBMutexFactory transactionDbMutexFactory) {
-//
-//  }
-
-  /**
-   * The policy for when to write the data into the DB. The default policy is to
-   * write only the committed data {@link TxnDBWritePolicy#WRITE_COMMITTED}.
-   * The data could be written before the commit phase. The DB then needs to
-   * provide the mechanisms to tell apart committed from uncommitted data.
-   *
-   * @return The write policy.
-   */
-  public TxnDBWritePolicy getWritePolicy() {
-    assert(isOwningHandle());
-    return TxnDBWritePolicy.getTxnDBWritePolicy(getWritePolicy(nativeHandle_));
-  }
-
-  /**
-   * The policy for when to write the data into the DB. The default policy is to
-   * write only the committed data {@link TxnDBWritePolicy#WRITE_COMMITTED}.
-   * The data could be written before the commit phase. The DB then needs to
-   * provide the mechanisms to tell apart committed from uncommitted data.
-   *
-   * @param writePolicy The write policy.
-   *
-   * @return this TransactionDBOptions instance
-   */
-  public TransactionDBOptions setWritePolicy(
-      final TxnDBWritePolicy writePolicy) {
-    assert(isOwningHandle());
-    setWritePolicy(nativeHandle_, writePolicy.getValue());
-    return this;
-  }
-
-  private native static long newTransactionDBOptions();
-  private native long getMaxNumLocks(final long handle);
-  private native void setMaxNumLocks(final long handle,
-      final long maxNumLocks);
-  private native long getNumStripes(final long handle);
-  private native void setNumStripes(final long handle, final long numStripes);
-  private native long getTransactionLockTimeout(final long handle);
-  private native void setTransactionLockTimeout(final long handle,
-      final long transactionLockTimeout);
-  private native long getDefaultLockTimeout(final long handle);
-  private native void setDefaultLockTimeout(final long handle,
-      final long transactionLockTimeout);
-  private native byte getWritePolicy(final long handle);
-  private native void setWritePolicy(final long handle, final byte writePolicy);
-  @Override protected final native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/TransactionOptions.java

@@ -1,189 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-public class TransactionOptions extends RocksObject
-    implements TransactionalOptions {
-
-  public TransactionOptions() {
-    super(newTransactionOptions());
-  }
-
-  @Override
-  public boolean isSetSnapshot() {
-    assert(isOwningHandle());
-    return isSetSnapshot(nativeHandle_);
-  }
-
-  @Override
-  public TransactionOptions setSetSnapshot(final boolean setSnapshot) {
-    assert(isOwningHandle());
-    setSetSnapshot(nativeHandle_, setSnapshot);
-    return this;
-  }
-
-  /**
-   * True means that before acquiring locks, this transaction will
-   * check if doing so will cause a deadlock. If so, it will return with
-   * {@link Status.Code#Busy}. The user should retry their transaction.
-   *
-   * @return true if a deadlock is detected.
-   */
-  public boolean isDeadlockDetect() {
-    assert(isOwningHandle());
-    return isDeadlockDetect(nativeHandle_);
-  }
-
-  /**
-   * Setting to true means that before acquiring locks, this transaction will
-   * check if doing so will cause a deadlock. If so, it will return with
-   * {@link Status.Code#Busy}. The user should retry their transaction.
-   *
-   * @param deadlockDetect true if we should detect deadlocks.
-   *
-   * @return this TransactionOptions instance
-   */
-  public TransactionOptions setDeadlockDetect(final boolean deadlockDetect) {
-    assert(isOwningHandle());
-    setDeadlockDetect(nativeHandle_, deadlockDetect);
-    return this;
-  }
-
-  /**
-   * The wait timeout in milliseconds when a transaction attempts to lock a key.
-   *
-   * If 0, no waiting is done if a lock cannot instantly be acquired.
-   * If negative, {@link TransactionDBOptions#getTransactionLockTimeout(long)}
-   * will be used
-   *
-   * @return the lock tiemout in milliseconds
-   */
-  public long getLockTimeout() {
-    assert(isOwningHandle());
-    return getLockTimeout(nativeHandle_);
-  }
-
-  /**
-   * If positive, specifies the wait timeout in milliseconds when
-   * a transaction attempts to lock a key.
-   *
-   * If 0, no waiting is done if a lock cannot instantly be acquired.
-   * If negative, {@link TransactionDBOptions#getTransactionLockTimeout(long)}
-   * will be used
-   *
-   * Default: -1
-   *
-   * @param lockTimeout the lock tiemout in milliseconds
-   *
-   * @return this TransactionOptions instance
-   */
-  public TransactionOptions setLockTimeout(final long lockTimeout) {
-    assert(isOwningHandle());
-    setLockTimeout(nativeHandle_, lockTimeout);
-    return this;
-  }
-
-  /**
-   * Expiration duration in milliseconds.
-   *
-   * If non-negative, transactions that last longer than this many milliseconds
-   * will fail to commit. If not set, a forgotten transaction that is never
-   * committed, rolled back, or deleted will never relinquish any locks it
-   * holds. This could prevent keys from being written by other writers.
-   *
-   * @return expiration the expiration duration in milliseconds
-   */
-  public long getExpiration() {
-    assert(isOwningHandle());
-    return getExpiration(nativeHandle_);
-  }
-
-  /**
-   * Expiration duration in milliseconds.
-   *
-   * If non-negative, transactions that last longer than this many milliseconds
-   * will fail to commit. If not set, a forgotten transaction that is never
-   * committed, rolled back, or deleted will never relinquish any locks it
-   * holds. This could prevent keys from being written by other writers.
-   *
-   * Default: -1
-   *
-   * @param expiration the expiration duration in milliseconds
-   *
-   * @return this TransactionOptions instance
-   */
-  public TransactionOptions setExpiration(final long expiration) {
-    assert(isOwningHandle());
-    setExpiration(nativeHandle_, expiration);
-    return this;
-  }
-
-  /**
-   * Gets the number of traversals to make during deadlock detection.
-   *
-   * @return the number of traversals to make during
-   *     deadlock detection
-   */
-  public long getDeadlockDetectDepth() {
-    return getDeadlockDetectDepth(nativeHandle_);
-  }
-
-  /**
-   * Sets the number of traversals to make during deadlock detection.
-   *
-   * Default: 50
-   *
-   * @param deadlockDetectDepth the the number of traversals to make during
-   *     deadlock detection
-   *
-   * @return this TransactionOptions instance
-   */
-  public TransactionOptions setDeadlockDetectDepth(
-      final long deadlockDetectDepth) {
-    setDeadlockDetectDepth(nativeHandle_, deadlockDetectDepth);
-    return this;
-  }
-
-  /**
-   * Get the maximum number of bytes that may be used for the write batch.
-   *
-   * @return the maximum number of bytes, 0 means no limit.
-   */
-  public long getMaxWriteBatchSize() {
-    return getMaxWriteBatchSize(nativeHandle_);
-  }
-
-  /**
-   * Set the maximum number of bytes that may be used for the write batch.
-   *
-   * @param maxWriteBatchSize the maximum number of bytes, 0 means no limit.
-   *
-   * @return this TransactionOptions instance
-   */
-  public TransactionOptions setMaxWriteBatchSize(final long maxWriteBatchSize) {
-    setMaxWriteBatchSize(nativeHandle_, maxWriteBatchSize);
-    return this;
-  }
-
-  private native static long newTransactionOptions();
-  private native boolean isSetSnapshot(final long handle);
-  private native void setSetSnapshot(final long handle,
-      final boolean setSnapshot);
-  private native boolean isDeadlockDetect(final long handle);
-  private native void setDeadlockDetect(final long handle,
-      final boolean deadlockDetect);
-  private native long getLockTimeout(final long handle);
-  private native void setLockTimeout(final long handle, final long lockTimeout);
-  private native long getExpiration(final long handle);
-  private native void setExpiration(final long handle, final long expiration);
-  private native long getDeadlockDetectDepth(final long handle);
-  private native void setDeadlockDetectDepth(final long handle,
-      final long deadlockDetectDepth);
-  private native long getMaxWriteBatchSize(final long handle);
-  private native void setMaxWriteBatchSize(final long handle,
-      final long maxWriteBatchSize);
-  @Override protected final native void disposeInternal(final long handle);
-}

java/src/main/java/org/rocksdb/TransactionalDB.java

@@ -1,68 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-
-interface TransactionalDB<T extends TransactionalOptions>
-    extends AutoCloseable {
-
-  /**
-   * Starts a new Transaction.
-   *
-   * Caller is responsible for calling {@link #close()} on the returned
-   * transaction when it is no longer needed.
-   *
-   * @param writeOptions Any write options for the transaction
-   * @return a new transaction
-   */
-  Transaction beginTransaction(final WriteOptions writeOptions);
-
-  /**
-   * Starts a new Transaction.
-   *
-   * Caller is responsible for calling {@link #close()} on the returned
-   * transaction when it is no longer needed.
-   *
-   * @param writeOptions Any write options for the transaction
-   * @param transactionOptions Any options for the transaction
-   * @return a new transaction
-   */
-  Transaction beginTransaction(final WriteOptions writeOptions,
-      final T transactionOptions);
-
-  /**
-   * Starts a new Transaction.
-   *
-   * Caller is responsible for calling {@link #close()} on the returned
-   * transaction when it is no longer needed.
-   *
-   * @param writeOptions Any write options for the transaction
-   * @param oldTransaction this Transaction will be reused instead of allocating
-   *     a new one. This is an optimization to avoid extra allocations
-   *     when repeatedly creating transactions.
-   * @return The oldTransaction which has been reinitialized as a new
-   *     transaction
-   */
-  Transaction beginTransaction(final WriteOptions writeOptions,
-      final Transaction oldTransaction);
-
-  /**
-   * Starts a new Transaction.
-   *
-   * Caller is responsible for calling {@link #close()} on the returned
-   * transaction when it is no longer needed.
-   *
-   * @param writeOptions Any write options for the transaction
-   * @param transactionOptions Any options for the transaction
-   * @param oldTransaction this Transaction will be reused instead of allocating
-   *     a new one. This is an optimization to avoid extra allocations
-   *     when repeatedly creating transactions.
-   * @return The oldTransaction which has been reinitialized as a new
-   *     transaction
-   */
-  Transaction beginTransaction(final WriteOptions writeOptions,
-      final T transactionOptions, final Transaction oldTransaction);
-}

java/src/main/java/org/rocksdb/TransactionalOptions.java

@@ -1,31 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-
-interface TransactionalOptions extends AutoCloseable {
-
-  /**
-   * True indicates snapshots will be set, just like if
-   * {@link Transaction#setSnapshot()} had been called
-   *
-   * @return whether a snapshot will be set
-   */
-  boolean isSetSnapshot();
-
-  /**
-   * Setting the setSnapshot to true is the same as calling
-   * {@link Transaction#setSnapshot()}.
-   *
-   * Default: false
-   *
-   * @param <T> The type of transactional options.
-   * @param setSnapshot Whether to set a snapshot
-   *
-   * @return this TransactionalOptions instance
-   */
-  <T extends TransactionalOptions> T setSetSnapshot(final boolean setSnapshot);
-}

java/src/main/java/org/rocksdb/TxnDBWritePolicy.java

@@ -1,62 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-package org.rocksdb;
-
-/**
- * The transaction db write policy.
- */
-public enum TxnDBWritePolicy {
-  /**
-   * Write only the committed data.
-   */
-  WRITE_COMMITTED((byte)0x00),
-
-  /**
-   * Write data after the prepare phase of 2pc.
-   */
-  WRITE_PREPARED((byte)0x1),
-
-  /**
-   * Write data before the prepare phase of 2pc.
-   */
-  WRITE_UNPREPARED((byte)0x2);
-
-  private byte value;
-
-  TxnDBWritePolicy(final byte value) {
-    this.value = value;
-  }
-
-  /**
-   * <p>Returns the byte value of the enumerations value.</p>
-   *
-   * @return byte representation
-   */
-  public byte getValue() {
-    return value;
-  }
-
-  /**
-   * <p>Get the TxnDBWritePolicy enumeration value by
-   * passing the byte identifier to this method.</p>
-   *
-   * @param byteIdentifier of TxnDBWritePolicy.
-   *
-   * @return TxnDBWritePolicy instance.
-   *
-   * @throws IllegalArgumentException If TxnDBWritePolicy cannot be found for
-   *     the provided byteIdentifier
-   */
-  public static TxnDBWritePolicy getTxnDBWritePolicy(final byte byteIdentifier) {
-    for (final TxnDBWritePolicy txnDBWritePolicy : TxnDBWritePolicy.values()) {
-      if (txnDBWritePolicy.getValue() == byteIdentifier) {
-        return txnDBWritePolicy;
-      }
-    }
-
-    throw new IllegalArgumentException(
-        "Illegal value provided for TxnDBWritePolicy.");
-  }
-}

java/src/main/java/org/rocksdb/WALRecoveryMode.java

@@ -65,7 +65,7 @@ public enum WALRecoveryMode {
    *
    * @param byteIdentifier of WALRecoveryMode.
    *
-   * @return WALRecoveryMode instance.
+   * @return CompressionType instance.
    *
    * @throws IllegalArgumentException If WALRecoveryMode cannot be found for the
    *   provided byteIdentifier

java/src/main/java/org/rocksdb/WBWIRocksIterator.java

@@ -55,13 +55,10 @@ public class WBWIRocksIterator
    * that created the record in the Write Batch
    */
   public enum WriteType {
-    PUT((byte)0x0),
-    MERGE((byte)0x1),
-    DELETE((byte)0x2),
-    SINGLE_DELETE((byte)0x3),
-    DELETE_RANGE((byte)0x4),
-    LOG((byte)0x5),
-    XID((byte)0x6);
+    PUT((byte)0x1),
+    MERGE((byte)0x2),
+    DELETE((byte)0x4),
+    LOG((byte)0x8);
 
     final byte id;
     WriteType(final byte id) {

java/src/main/java/org/rocksdb/WriteBatch.java

@@ -39,14 +39,6 @@ public class WriteBatch extends AbstractWriteBatch {
     super(newWriteBatch(reserved_bytes));
   }
 
-  /**
-   * Constructs a WriteBatch instance from a serialized representation
-   * as returned by {@link #data()}.
-   */
-  public WriteBatch(final byte[] serialized) {
-    super(newWriteBatch(serialized, serialized.length));
-  }
-
   /**
    * Support for iterating over the contents of a batch.
    *
@@ -59,134 +51,6 @@ public class WriteBatch extends AbstractWriteBatch {
     iterate(nativeHandle_, handler.nativeHandle_);
   }
 
-  /**
-   * Retrieve the serialized version of this batch.
-   *
-   * @return the serialized representation of this write batch.
-   */
-  public byte[] data() {
-    return data(nativeHandle_);
-  }
-
-  /**
-   * Retrieve data size of the batch.
-   *
-   * @return the serialized data size of the batch.
-   */
-  public long getDataSize() {
-    return getDataSize(nativeHandle_);
-  }
-
-  /**
-   * Returns true if PutCF will be called during Iterate.
-   *
-   * Return true if PutCF will be called during Iterate.
-   */
-  public boolean hasPut() {
-    return hasPut(nativeHandle_);
-  }
-
-  /**
-   * Returns true if DeleteCF will be called during Iterate.
-   *
-   * Return true if DeleteCF will be called during Iterate.
-   */
-  public boolean hasDelete() {
-    return hasDelete(nativeHandle_);
-  }
-
-  /**
-   * Returns true if SingleDeleteCF will be called during Iterate.
-   *
-   * Return true if SingleDeleteCF will be called during Iterate.
-   */
-  public boolean hasSingleDelete() {
-    return hasSingleDelete(nativeHandle_);
-  }
-
-  /**
-   * Returns true if DeleteRangeCF will be called during Iterate.
-   *
-   * Return true if DeleteRangeCF will be called during Iterate.
-   */
-  public boolean hasDeleteRange() {
-    return hasDeleteRange(nativeHandle_);
-  }
-
-  /**
-   * Returns true if MergeCF will be called during Iterate.
-   *
-   * Return true if MergeCF will be called during Iterate.
-   */
-  public boolean hasMerge() {
-    return hasMerge(nativeHandle_);
-  }
-
-  /**
-   * Returns true if MarkBeginPrepare will be called during Iterate.
-   *
-   * Return true if MarkBeginPrepare will be called during Iterate.
-   */
-  public boolean hasBeginPrepare() {
-    return hasBeginPrepare(nativeHandle_);
-  }
-
-  /**
-   * Returns true if MarkEndPrepare will be called during Iterate.
-   *
-   * Return true if MarkEndPrepare will be called during Iterate.
-   */
-  public boolean hasEndPrepare() {
-    return hasEndPrepare(nativeHandle_);
-  }
-
-  /**
-   * Returns true if MarkCommit will be called during Iterate.
-   *
-   * Return true if MarkCommit will be called during Iterate.
-   */
-  public boolean hasCommit() {
-    return hasCommit(nativeHandle_);
-  }
-
-  /**
-   * Returns true if MarkRollback will be called during Iterate.
-   *
-   * Return true if MarkRollback will be called during Iterate.
-   */
-  public boolean hasRollback() {
-    return hasRollback(nativeHandle_);
-  }
-
-  @Override
-  public WriteBatch getWriteBatch() {
-    return this;
-  }
-
-  /**
-   * Marks this point in the WriteBatch as the last record to
-   * be inserted into the WAL, provided the WAL is enabled.
-   */
-  public void markWalTerminationPoint() {
-    markWalTerminationPoint(nativeHandle_);
-  }
-
-  /**
-   * Gets the WAL termination point.
-   *
-   * See {@link #markWalTerminationPoint()}
-   *
-   * @return the WAL termination point
-   */
-  public SavePoint getWalTerminationPoint() {
-    return getWalTerminationPoint(nativeHandle_);
-  }
-
-  @Override
-  WriteBatch getWriteBatch(final long handle) {
-    return this;
-  }
-
   /**
    * <p>Private WriteBatch constructor which is used to construct
    * WriteBatch instances from C++ side. As the reference to this
@@ -223,14 +87,10 @@ public class WriteBatch extends AbstractWriteBatch {
   @Override final native void merge(final long handle, final byte[] key,
       final int keyLen, final byte[] value, final int valueLen,
       final long cfHandle);
-  @Override final native void delete(final long handle, final byte[] key,
-      final int keyLen) throws RocksDBException;
-  @Override final native void delete(final long handle, final byte[] key,
-      final int keyLen, final long cfHandle) throws RocksDBException;
-  @Override final native void singleDelete(final long handle, final byte[] key,
-      final int keyLen) throws RocksDBException;
-  @Override final native void singleDelete(final long handle, final byte[] key,
-      final int keyLen, final long cfHandle) throws RocksDBException;
+  @Override final native void remove(final long handle, final byte[] key,
+      final int keyLen);
+  @Override final native void remove(final long handle, final byte[] key,
+      final int keyLen, final long cfHandle);
   @Override
   final native void deleteRange(final long handle, final byte[] beginKey, final int beginKeyLen,
       final byte[] endKey, final int endKeyLen);
@@ -238,32 +98,15 @@ public class WriteBatch extends AbstractWriteBatch {
   final native void deleteRange(final long handle, final byte[] beginKey, final int beginKeyLen,
       final byte[] endKey, final int endKeyLen, final long cfHandle);
   @Override final native void putLogData(final long handle,
-      final byte[] blob, final int blobLen) throws RocksDBException;
+      final byte[] blob, final int blobLen);
   @Override final native void clear0(final long handle);
   @Override final native void setSavePoint0(final long handle);
   @Override final native void rollbackToSavePoint0(final long handle);
-  @Override final native void popSavePoint(final long handle) throws RocksDBException;
-  @Override final native void setMaxBytes(final long nativeHandle,
-    final long maxBytes);
 
   private native static long newWriteBatch(final int reserved_bytes);
-  private native static long newWriteBatch(final byte[] serialized,
-      final int serializedLength);
   private native void iterate(final long handle, final long handlerHandle)
       throws RocksDBException;
-  private native byte[] data(final long nativeHandle);
-  private native long getDataSize(final long nativeHandle);
-  private native boolean hasPut(final long nativeHandle);
-  private native boolean hasDelete(final long nativeHandle);
-  private native boolean hasSingleDelete(final long nativeHandle);
-  private native boolean hasDeleteRange(final long nativeHandle);
-  private native boolean hasMerge(final long nativeHandle);
-  private native boolean hasBeginPrepare(final long nativeHandle);
-  private native boolean hasEndPrepare(final long nativeHandle);
-  private native boolean hasCommit(final long nativeHandle);
-  private native boolean hasRollback(final long nativeHandle);
-  private native void markWalTerminationPoint(final long nativeHandle);
-  private native SavePoint getWalTerminationPoint(final long nativeHandle);
+
 
   /**
    * Handler callback for iterating over the contents of a batch.
@@ -279,38 +122,15 @@ public class WriteBatch extends AbstractWriteBatch {
       return createNewHandler0();
     }
 
-    public abstract void put(final int columnFamilyId, final byte[] key,
-        final byte[] value) throws RocksDBException;
-    public abstract void put(final byte[] key, final byte[] value);
-    public abstract void merge(final int columnFamilyId, final byte[] key,
-        final byte[] value) throws RocksDBException;
-    public abstract void merge(final byte[] key, final byte[] value);
-    public abstract void delete(final int columnFamilyId, final byte[] key)
-        throws RocksDBException;
-    public abstract void delete(final byte[] key);
-    public abstract void singleDelete(final int columnFamilyId,
-        final byte[] key) throws RocksDBException;
-    public abstract void singleDelete(final byte[] key);
-    public abstract void deleteRange(final int columnFamilyId,
-        final byte[] beginKey, final byte[] endKey) throws RocksDBException;
-    public abstract void deleteRange(final byte[] beginKey,
-        final byte[] endKey);
-    public abstract void logData(final byte[] blob);
-    public abstract void putBlobIndex(final int columnFamilyId,
-        final byte[] key, final byte[] value) throws RocksDBException;
-    public abstract void markBeginPrepare() throws RocksDBException;
-    public abstract void markEndPrepare(final byte[] xid)
-        throws RocksDBException;
-    public abstract void markNoop(final boolean emptyBatch)
-        throws RocksDBException;
-    public abstract void markRollback(final byte[] xid)
-        throws RocksDBException;
-    public abstract void markCommit(final byte[] xid)
-        throws RocksDBException;
+    public abstract void put(byte[] key, byte[] value);
+    public abstract void merge(byte[] key, byte[] value);
+    public abstract void delete(byte[] key);
+    public abstract void deleteRange(byte[] beginKey, byte[] endKey);
+    public abstract void logData(byte[] blob);
 
     /**
      * shouldContinue is called by the underlying iterator
-     * {@link WriteBatch#iterate(Handler)}. If it returns false,
+     * WriteBatch::Iterate. If it returns false,
      * iteration is halted. Otherwise, it continues
      * iterating. The default implementation always
      * returns true.
@@ -324,57 +144,4 @@ public class WriteBatch extends AbstractWriteBatch {
 
     private native long createNewHandler0();
   }
-
-  /**
-   * A structure for describing the save point in the Write Batch.
-   */
-  public static class SavePoint {
-    private long size;
-    private long count;
-    private long contentFlags;
-
-    public SavePoint(final long size, final long count,
-        final long contentFlags) {
-      this.size = size;
-      this.count = count;
-      this.contentFlags = contentFlags;
-    }
-
-    public void clear() {
-      this.size = 0;
-      this.count = 0;
-      this.contentFlags = 0;
-    }
-
-    /**
-     * Get the size of the serialized representation.
-     *
-     * @return the size of the serialized representation.
-     */
-    public long getSize() {
-      return size;
-    }
-
-    /**
-     * Get the number of elements.
-     *
-     * @return the number of elements.
-     */
-    public long getCount() {
-      return count;
-    }
-
-    /**
-     * Get the content flags.
-     *
-     * @return the content flags.
-     */
-    public long getContentFlags() {
-      return contentFlags;
-    }
-
-    public boolean isCleared() {
-      return (size | count | contentFlags) == 0;
-    }
-  }
 }

java/src/main/java/org/rocksdb/WriteBatchInterface.java

@@ -24,7 +24,7 @@ public interface WriteBatchInterface {
      * @param key the specified key to be inserted.
      * @param value the value associated with the specified key.
      */
-    void put(byte[] key, byte[] value) throws RocksDBException;
+    void put(byte[] key, byte[] value);
 
     /**
      * <p>Store the mapping "key-&gt;value" within given column
@@ -36,7 +36,7 @@ public interface WriteBatchInterface {
      * @param value the value associated with the specified key.
      */
     void put(ColumnFamilyHandle columnFamilyHandle,
-                    byte[] key, byte[] value) throws RocksDBException;
+                    byte[] key, byte[] value);
 
     /**
      * <p>Merge "value" with the existing value of "key" in the database.
@@ -46,7 +46,7 @@ public interface WriteBatchInterface {
      * @param value the value to be merged with the current value for
      * the specified key.
      */
-    void merge(byte[] key, byte[] value) throws RocksDBException;
+    void merge(byte[] key, byte[] value);
 
     /**
      * <p>Merge "value" with the existing value of "key" in given column family.
@@ -58,36 +58,14 @@ public interface WriteBatchInterface {
      * the specified key.
      */
     void merge(ColumnFamilyHandle columnFamilyHandle,
-                      byte[] key, byte[] value) throws RocksDBException;
-
-    /**
-     * <p>If the database contains a mapping for "key", erase it.  Else do nothing.</p>
-     *
-     * @param key Key to delete within database
-     *
-     * @deprecated Use {@link #delete(byte[])}
-     */
-    @Deprecated
-    void remove(byte[] key) throws RocksDBException;
-
-    /**
-     * <p>If column family contains a mapping for "key", erase it.  Else do nothing.</p>
-     *
-     * @param columnFamilyHandle {@link ColumnFamilyHandle} instance
-     * @param key Key to delete within database
-     *
-     * @deprecated Use {@link #delete(ColumnFamilyHandle, byte[])}
-     */
-    @Deprecated
-    void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key)
-        throws RocksDBException;
+                      byte[] key, byte[] value);
 
     /**
      * <p>If the database contains a mapping for "key", erase it.  Else do nothing.</p>
      *
      * @param key Key to delete within database
      */
-    void delete(byte[] key) throws RocksDBException;
+    void remove(byte[] key);
 
     /**
      * <p>If column family contains a mapping for "key", erase it.  Else do nothing.</p>
@@ -95,58 +73,7 @@ public interface WriteBatchInterface {
      * @param columnFamilyHandle {@link ColumnFamilyHandle} instance
      * @param key Key to delete within database
      */
-    void delete(ColumnFamilyHandle columnFamilyHandle, byte[] key)
-        throws RocksDBException;
-
-    /**
-     * Remove the database entry for {@code key}. Requires that the key exists
-     * and was not overwritten. It is not an error if the key did not exist
-     * in the database.
-     *
-     * If a key is overwritten (by calling {@link #put(byte[], byte[])} multiple
-     * times), then the result of calling SingleDelete() on this key is undefined.
-     * SingleDelete() only behaves correctly if there has been only one Put()
-     * for this key since the previous call to SingleDelete() for this key.
-     *
-     * This feature is currently an experimental performance optimization
-     * for a very specific workload. It is up to the caller to ensure that
-     * SingleDelete is only used for a key that is not deleted using Delete() or
-     * written using Merge(). Mixing SingleDelete operations with Deletes and
-     * Merges can result in undefined behavior.
-     *
-     * @param key Key to delete within database
-     *
-     * @throws RocksDBException thrown if error happens in underlying
-     *     native library.
-     */
-    @Experimental("Performance optimization for a very specific workload")
-    void singleDelete(final byte[] key) throws RocksDBException;
-
-    /**
-     * Remove the database entry for {@code key}. Requires that the key exists
-     * and was not overwritten. It is not an error if the key did not exist
-     * in the database.
-     *
-     * If a key is overwritten (by calling {@link #put(byte[], byte[])} multiple
-     * times), then the result of calling SingleDelete() on this key is undefined.
-     * SingleDelete() only behaves correctly if there has been only one Put()
-     * for this key since the previous call to SingleDelete() for this key.
-     *
-     * This feature is currently an experimental performance optimization
-     * for a very specific workload. It is up to the caller to ensure that
-     * SingleDelete is only used for a key that is not deleted using Delete() or
-     * written using Merge(). Mixing SingleDelete operations with Deletes and
-     * Merges can result in undefined behavior.
-     *
-     * @param columnFamilyHandle The column family to delete the key from
-     * @param key Key to delete within database
-     *
-     * @throws RocksDBException thrown if error happens in underlying
-     *     native library.
-     */
-    @Experimental("Performance optimization for a very specific workload")
-    void singleDelete(final ColumnFamilyHandle columnFamilyHandle,
-            final byte[] key) throws RocksDBException;
+    void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key);
 
     /**
      * Removes the database entries in the range ["beginKey", "endKey"), i.e.,
@@ -162,7 +89,7 @@ public interface WriteBatchInterface {
      * @param endKey
      *          Last key to delete within database (excluded)
      */
-    void deleteRange(byte[] beginKey, byte[] endKey) throws RocksDBException;
+    void deleteRange(byte[] beginKey, byte[] endKey);
 
     /**
      * Removes the database entries in the range ["beginKey", "endKey"), i.e.,
@@ -179,8 +106,7 @@ public interface WriteBatchInterface {
      * @param endKey
      *          Last key to delete within database (excluded)
      */
-    void deleteRange(ColumnFamilyHandle columnFamilyHandle, byte[] beginKey,
-            byte[] endKey) throws RocksDBException;
+    void deleteRange(ColumnFamilyHandle columnFamilyHandle, byte[] beginKey, byte[] endKey);
 
     /**
      * Append a blob of arbitrary size to the records in this batch. The blob will
@@ -196,7 +122,7 @@ public interface WriteBatchInterface {
      *
      * @param blob binary object to be inserted
      */
-    void putLogData(byte[] blob) throws RocksDBException;
+    void putLogData(byte[] blob);
 
     /**
      * Clear all updates buffered in this batch
@@ -217,30 +143,4 @@ public interface WriteBatchInterface {
      * @throws RocksDBException if there is no previous call to SetSavePoint()
      */
     void rollbackToSavePoint() throws RocksDBException;
-
-    /**
-     * Pop the most recent save point.
-     *
-     * That is to say that it removes the last save point,
-     * which was set by {@link #setSavePoint()}.
-     *
-     * @throws RocksDBException If there is no previous call to
-     *     {@link #setSavePoint()}, an exception with
-     *     {@link Status.Code#NotFound} will be thrown.
-     */
-    void popSavePoint() throws RocksDBException;
-
-    /**
-     * Set the maximum size of the write batch.
-     *
-     * @param maxBytes the maximum size in bytes.
-     */
-    void setMaxBytes(long maxBytes);
-
-    /**
-     * Get the underlying Write Batch.
-     *
-     * @return the underlying WriteBatch.
-     */
-    WriteBatch getWriteBatch();
 }

java/src/main/java/org/rocksdb/WriteBatchWithIndex.java

@@ -61,20 +61,7 @@ public class WriteBatchWithIndex extends AbstractWriteBatch {
           fallbackIndexComparator, final int reservedBytes,
       final boolean overwriteKey) {
     super(newWriteBatchWithIndex(fallbackIndexComparator.nativeHandle_,
-        fallbackIndexComparator.getComparatorType().getValue(), reservedBytes,
-        overwriteKey));
-  }
-
-  /**
-   * <p>Private WriteBatchWithIndex constructor which is used to construct
-   * WriteBatchWithIndex instances from C++ side. As the reference to this
-   * object is also managed from C++ side the handle will be disowned.</p>
-   *
-   * @param nativeHandle address of native instance.
-   */
-  WriteBatchWithIndex(final long nativeHandle) {
-    super(nativeHandle);
-    disOwnNativeHandle();
+        fallbackIndexComparator instanceof DirectComparator, reservedBytes, overwriteKey));
   }
 
   /**
@@ -257,14 +244,10 @@ public class WriteBatchWithIndex extends AbstractWriteBatch {
   @Override final native void merge(final long handle, final byte[] key,
       final int keyLen, final byte[] value, final int valueLen,
       final long cfHandle);
-  @Override final native void delete(final long handle, final byte[] key,
-      final int keyLen) throws RocksDBException;
-  @Override final native void delete(final long handle, final byte[] key,
-      final int keyLen, final long cfHandle) throws RocksDBException;
-  @Override final native void singleDelete(final long handle, final byte[] key,
-      final int keyLen) throws RocksDBException;
-  @Override final native void singleDelete(final long handle, final byte[] key,
-      final int keyLen, final long cfHandle) throws RocksDBException;
+  @Override final native void remove(final long handle, final byte[] key,
+      final int keyLen);
+  @Override final native void remove(final long handle, final byte[] key,
+      final int keyLen, final long cfHandle);
   @Override
   final native void deleteRange(final long handle, final byte[] beginKey, final int beginKeyLen,
       final byte[] endKey, final int endKeyLen);
@@ -272,20 +255,15 @@ public class WriteBatchWithIndex extends AbstractWriteBatch {
   final native void deleteRange(final long handle, final byte[] beginKey, final int beginKeyLen,
       final byte[] endKey, final int endKeyLen, final long cfHandle);
   @Override final native void putLogData(final long handle, final byte[] blob,
-      final int blobLen) throws RocksDBException;
+      final int blobLen);
   @Override final native void clear0(final long handle);
   @Override final native void setSavePoint0(final long handle);
   @Override final native void rollbackToSavePoint0(final long handle);
-  @Override final native void popSavePoint(final long handle) throws RocksDBException;
-  @Override final native void setMaxBytes(final long nativeHandle,
-      final long maxBytes);
-  @Override final native WriteBatch getWriteBatch(final long handle);
 
   private native static long newWriteBatchWithIndex();
   private native static long newWriteBatchWithIndex(final boolean overwriteKey);
   private native static long newWriteBatchWithIndex(
-      final long fallbackIndexComparatorHandle,
-      final byte comparatorType, final int reservedBytes,
+      final long fallbackIndexComparatorHandle, final boolean isDirect, final int reservedBytes,
       final boolean overwriteKey);
   private native long iterator0(final long handle);
   private native long iterator1(final long handle, final long cfHandle);

java/src/main/java/org/rocksdb/WriteOptions.java

@@ -20,12 +20,6 @@ public class WriteOptions extends RocksObject {
 
   }
 
-  // TODO(AR) consider ownership
-  WriteOptions(final long nativeHandle) {
-    super(nativeHandle);
-    disOwnNativeHandle();
-  }
-
   /**
    * If true, the write will be flushed from the operating system
    * buffer cache (by calling WritableFile::Sync()) before the write

java/src/test/java/org/rocksdb/AbstractTransactionTest.java

@@ -1,903 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Base class of {@link TransactionTest} and {@link OptimisticTransactionTest}
- */
-public abstract class AbstractTransactionTest {
-
-  protected final static byte[] TXN_TEST_COLUMN_FAMILY = "txn_test_cf"
-      .getBytes();
-
-  protected static final Random rand = PlatformRandomHelper.
-      getPlatformSpecificRandomFactory();
-
-  @Rule
-  public TemporaryFolder dbFolder = new TemporaryFolder();
-
-  public abstract DBContainer startDb()
-      throws RocksDBException;
-
-  @Test
-  public void setSnapshot() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.setSnapshot();
-    }
-  }
-
-  @Test
-  public void setSnapshotOnNextOperation() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.setSnapshotOnNextOperation();
-      txn.put("key1".getBytes(), "value1".getBytes());
-    }
-  }
-
-  @Test
-  public void setSnapshotOnNextOperation_transactionNotifier() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      try(final TestTransactionNotifier notifier = new TestTransactionNotifier()) {
-        txn.setSnapshotOnNextOperation(notifier);
-        txn.put("key1".getBytes(), "value1".getBytes());
-
-        txn.setSnapshotOnNextOperation(notifier);
-        txn.put("key2".getBytes(), "value2".getBytes());
-
-        assertThat(notifier.getCreatedSnapshots().size()).isEqualTo(2);
-      }
-    }
-  }
-
-  @Test
-  public void getSnapshot() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.setSnapshot();
-      final Snapshot snapshot = txn.getSnapshot();
-      assertThat(snapshot.isOwningHandle()).isFalse();
-    }
-  }
-
-  @Test
-  public void getSnapshot_null() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final Snapshot snapshot = txn.getSnapshot();
-      assertThat(snapshot).isNull();
-    }
-  }
-
-  @Test
-  public void clearSnapshot() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.setSnapshot();
-      txn.clearSnapshot();
-    }
-  }
-
-  @Test
-  public void clearSnapshot_none() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.clearSnapshot();
-    }
-  }
-
-  @Test
-  public void commit() throws RocksDBException {
-    final byte k1[] = "rollback-key1".getBytes(UTF_8);
-    final byte v1[] = "rollback-value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb()) {
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(k1, v1);
-        txn.commit();
-      }
-
-      try(final ReadOptions readOptions = new ReadOptions();
-          final Transaction txn2 = dbContainer.beginTransaction()) {
-        assertThat(txn2.get(readOptions, k1)).isEqualTo(v1);
-      }
-    }
-  }
-
-  @Test
-  public void rollback() throws RocksDBException {
-    final byte k1[] = "rollback-key1".getBytes(UTF_8);
-    final byte v1[] = "rollback-value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb()) {
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(k1, v1);
-        txn.rollback();
-      }
-
-      try(final ReadOptions readOptions = new ReadOptions();
-          final Transaction txn2 = dbContainer.beginTransaction()) {
-        assertThat(txn2.get(readOptions, k1)).isNull();
-      }
-    }
-  }
-
-  @Test
-  public void savePoint() throws RocksDBException {
-    final byte k1[] = "savePoint-key1".getBytes(UTF_8);
-    final byte v1[] = "savePoint-value1".getBytes(UTF_8);
-    final byte k2[] = "savePoint-key2".getBytes(UTF_8);
-    final byte v2[] = "savePoint-value2".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-
-
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(k1, v1);
-
-        assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-
-        txn.setSavePoint();
-
-        txn.put(k2, v2);
-
-        assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-        assertThat(txn.get(readOptions, k2)).isEqualTo(v2);
-
-        txn.rollbackToSavePoint();
-
-        assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-        assertThat(txn.get(readOptions, k2)).isNull();
-
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        assertThat(txn2.get(readOptions, k1)).isEqualTo(v1);
-        assertThat(txn2.get(readOptions, k2)).isNull();
-      }
-    }
-  }
-
-  @Test
-  public void getPut_cf() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      assertThat(txn.get(testCf, readOptions, k1)).isNull();
-      txn.put(testCf, k1, v1);
-      assertThat(txn.get(testCf, readOptions, k1)).isEqualTo(v1);
-    }
-  }
-
-  @Test
-  public void getPut() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.get(readOptions, k1)).isNull();
-      txn.put(k1, v1);
-      assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-    }
-  }
-
-  @Test
-  public void multiGetPut_cf() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      final List<ColumnFamilyHandle> cfList = Arrays.asList(testCf, testCf);
-
-      assertThat(txn.multiGet(readOptions, cfList, keys)).isEqualTo(new byte[][] { null, null });
-
-      txn.put(testCf, keys[0], values[0]);
-      txn.put(testCf, keys[1], values[1]);
-      assertThat(txn.multiGet(readOptions, cfList, keys)).isEqualTo(values);
-    }
-  }
-
-  @Test
-  public void multiGetPut() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      assertThat(txn.multiGet(readOptions, keys)).isEqualTo(new byte[][] { null, null });
-
-      txn.put(keys[0], values[0]);
-      txn.put(keys[1], values[1]);
-      assertThat(txn.multiGet(readOptions, keys)).isEqualTo(values);
-    }
-  }
-
-  @Test
-  public void getForUpdate_cf() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      assertThat(txn.getForUpdate(readOptions, testCf, k1, true)).isNull();
-      txn.put(testCf, k1, v1);
-      assertThat(txn.getForUpdate(readOptions, testCf, k1, true)).isEqualTo(v1);
-    }
-  }
-
-  @Test
-  public void getForUpdate() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.getForUpdate(readOptions, k1, true)).isNull();
-      txn.put(k1, v1);
-      assertThat(txn.getForUpdate(readOptions, k1, true)).isEqualTo(v1);
-    }
-  }
-
-  @Test
-  public void multiGetForUpdate_cf() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      final List<ColumnFamilyHandle> cfList = Arrays.asList(testCf, testCf);
-
-      assertThat(txn.multiGetForUpdate(readOptions, cfList, keys))
-          .isEqualTo(new byte[][] { null, null });
-
-      txn.put(testCf, keys[0], values[0]);
-      txn.put(testCf, keys[1], values[1]);
-      assertThat(txn.multiGetForUpdate(readOptions, cfList, keys))
-          .isEqualTo(values);
-    }
-  }
-
-  @Test
-  public void multiGetForUpdate() throws RocksDBException {
-    final byte keys[][] = new byte[][]{
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][]{
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-
-    try (final DBContainer dbContainer = startDb();
-         final ReadOptions readOptions = new ReadOptions();
-         final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.multiGetForUpdate(readOptions, keys)).isEqualTo(new byte[][]{null, null});
-
-      txn.put(keys[0], values[0]);
-      txn.put(keys[1], values[1]);
-      assertThat(txn.multiGetForUpdate(readOptions, keys)).isEqualTo(values);
-    }
-  }
-
-  @Test
-  public void getIterator() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      final byte[] k1 = "key1".getBytes(UTF_8);
-      final byte[] v1 = "value1".getBytes(UTF_8);
-
-      txn.put(k1, v1);
-
-      try(final RocksIterator iterator = txn.getIterator(readOptions)) {
-        iterator.seek(k1);
-        assertThat(iterator.isValid()).isTrue();
-        assertThat(iterator.key()).isEqualTo(k1);
-        assertThat(iterator.value()).isEqualTo(v1);
-      }
-    }
-  }
-
-  @Test
-  public void getIterator_cf() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-
-      final byte[] k1 = "key1".getBytes(UTF_8);
-      final byte[] v1 = "value1".getBytes(UTF_8);
-
-      txn.put(testCf, k1, v1);
-
-      try(final RocksIterator iterator = txn.getIterator(readOptions, testCf)) {
-        iterator.seek(k1);
-        assertThat(iterator.isValid()).isTrue();
-        assertThat(iterator.key()).isEqualTo(k1);
-        assertThat(iterator.value()).isEqualTo(v1);
-      }
-    }
-  }
-
-  @Test
-  public void merge_cf() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.merge(testCf, k1, v1);
-    }
-  }
-
-  @Test
-  public void merge() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.merge(k1, v1);
-    }
-  }
-
-
-  @Test
-  public void delete_cf() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.put(testCf, k1, v1);
-      assertThat(txn.get(testCf, readOptions, k1)).isEqualTo(v1);
-
-      txn.delete(testCf, k1);
-      assertThat(txn.get(testCf, readOptions, k1)).isNull();
-    }
-  }
-
-  @Test
-  public void delete() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.put(k1, v1);
-      assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-
-      txn.delete(k1);
-      assertThat(txn.get(readOptions, k1)).isNull();
-    }
-  }
-
-  @Test
-  public void delete_parts_cf() throws RocksDBException {
-    final byte keyParts[][] = new byte[][] {
-        "ke".getBytes(UTF_8),
-        "y1".getBytes(UTF_8)};
-    final byte valueParts[][] = new byte[][] {
-        "val".getBytes(UTF_8),
-        "ue1".getBytes(UTF_8)};
-    final byte[] key = concat(keyParts);
-    final byte[] value = concat(valueParts);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.put(testCf, keyParts, valueParts);
-      assertThat(txn.get(testCf, readOptions, key)).isEqualTo(value);
-
-      txn.delete(testCf, keyParts);
-
-      assertThat(txn.get(testCf, readOptions, key))
-          .isNull();
-    }
-  }
-
-  @Test
-  public void delete_parts() throws RocksDBException {
-    final byte keyParts[][] = new byte[][] {
-        "ke".getBytes(UTF_8),
-        "y1".getBytes(UTF_8)};
-    final byte valueParts[][] = new byte[][] {
-        "val".getBytes(UTF_8),
-        "ue1".getBytes(UTF_8)};
-    final byte[] key = concat(keyParts);
-    final byte[] value = concat(valueParts);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      txn.put(keyParts, valueParts);
-
-      assertThat(txn.get(readOptions, key)).isEqualTo(value);
-
-      txn.delete(keyParts);
-
-      assertThat(txn.get(readOptions, key)).isNull();
-    }
-  }
-
-  @Test
-  public void getPutUntracked_cf() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      assertThat(txn.get(testCf, readOptions, k1)).isNull();
-      txn.putUntracked(testCf, k1, v1);
-      assertThat(txn.get(testCf, readOptions, k1)).isEqualTo(v1);
-    }
-  }
-
-  @Test
-  public void getPutUntracked() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.get(readOptions, k1)).isNull();
-      txn.putUntracked(k1, v1);
-      assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-    }
-  }
-
-  @Test
-  public void multiGetPutUntracked_cf() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-
-      final List<ColumnFamilyHandle> cfList = Arrays.asList(testCf, testCf);
-
-      assertThat(txn.multiGet(readOptions, cfList, keys)).isEqualTo(new byte[][] { null, null });
-      txn.putUntracked(testCf, keys[0], values[0]);
-      txn.putUntracked(testCf, keys[1], values[1]);
-      assertThat(txn.multiGet(readOptions, cfList, keys)).isEqualTo(values);
-    }
-  }
-
-  @Test
-  public void multiGetPutUntracked() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      assertThat(txn.multiGet(readOptions, keys)).isEqualTo(new byte[][] { null, null });
-      txn.putUntracked(keys[0], values[0]);
-      txn.putUntracked(keys[1], values[1]);
-      assertThat(txn.multiGet(readOptions, keys)).isEqualTo(values);
-    }
-  }
-
-  @Test
-  public void mergeUntracked_cf() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.mergeUntracked(testCf, k1, v1);
-    }
-  }
-
-  @Test
-  public void mergeUntracked() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.mergeUntracked(k1, v1);
-    }
-  }
-
-  @Test
-  public void deleteUntracked_cf() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.put(testCf, k1, v1);
-      assertThat(txn.get(testCf, readOptions, k1)).isEqualTo(v1);
-
-      txn.deleteUntracked(testCf, k1);
-      assertThat(txn.get(testCf, readOptions, k1)).isNull();
-    }
-  }
-
-  @Test
-  public void deleteUntracked() throws RocksDBException {
-    final byte[] k1 = "key1".getBytes(UTF_8);
-    final byte[] v1 = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.put(k1, v1);
-      assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-
-      txn.deleteUntracked(k1);
-      assertThat(txn.get(readOptions, k1)).isNull();
-    }
-  }
-
-  @Test
-  public void deleteUntracked_parts_cf() throws RocksDBException {
-    final byte keyParts[][] = new byte[][] {
-        "ke".getBytes(UTF_8),
-        "y1".getBytes(UTF_8)};
-    final byte valueParts[][] = new byte[][] {
-        "val".getBytes(UTF_8),
-        "ue1".getBytes(UTF_8)};
-    final byte[] key = concat(keyParts);
-    final byte[] value = concat(valueParts);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.put(testCf, keyParts, valueParts);
-      assertThat(txn.get(testCf, readOptions, key)).isEqualTo(value);
-
-      txn.deleteUntracked(testCf, keyParts);
-      assertThat(txn.get(testCf, readOptions, key)).isNull();
-    }
-  }
-
-  @Test
-  public void deleteUntracked_parts() throws RocksDBException {
-    final byte keyParts[][] = new byte[][] {
-        "ke".getBytes(UTF_8),
-        "y1".getBytes(UTF_8)};
-    final byte valueParts[][] = new byte[][] {
-        "val".getBytes(UTF_8),
-        "ue1".getBytes(UTF_8)};
-    final byte[] key = concat(keyParts);
-    final byte[] value = concat(valueParts);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.put(keyParts, valueParts);
-      assertThat(txn.get(readOptions, key)).isEqualTo(value);
-
-      txn.deleteUntracked(keyParts);
-      assertThat(txn.get(readOptions, key)).isNull();
-    }
-  }
-
-  @Test
-  public void putLogData() throws RocksDBException {
-    final byte[] blob = "blobby".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.putLogData(blob);
-    }
-  }
-
-  @Test
-  public void enabledDisableIndexing() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.disableIndexing();
-      txn.enableIndexing();
-      txn.disableIndexing();
-      txn.enableIndexing();
-    }
-  }
-
-  @Test
-  public void numKeys() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    final byte k2[] = "key2".getBytes(UTF_8);
-    final byte v2[] = "value2".getBytes(UTF_8);
-    final byte k3[] = "key3".getBytes(UTF_8);
-    final byte v3[] = "value3".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      txn.put(k1, v1);
-      txn.put(testCf, k2, v2);
-      txn.merge(k3, v3);
-      txn.delete(testCf, k2);
-
-      assertThat(txn.getNumKeys()).isEqualTo(3);
-      assertThat(txn.getNumPuts()).isEqualTo(2);
-      assertThat(txn.getNumMerges()).isEqualTo(1);
-      assertThat(txn.getNumDeletes()).isEqualTo(1);
-    }
-  }
-
-  @Test
-  public void elapsedTime() throws RocksDBException, InterruptedException {
-    final long preStartTxnTime = System.currentTimeMillis();
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      Thread.sleep(1);
-
-      final long txnElapsedTime = txn.getElapsedTime();
-      assertThat(txnElapsedTime).isLessThan(System.currentTimeMillis()
-          - preStartTxnTime);
-      assertThat(txnElapsedTime).isGreaterThan(0);
-    }
-  }
-
-  @Test
-  public void getWriteBatch() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      txn.put(k1, v1);
-
-      final WriteBatchWithIndex writeBatch = txn.getWriteBatch();
-      assertThat(writeBatch).isNotNull();
-      assertThat(writeBatch.isOwningHandle()).isFalse();
-      assertThat(writeBatch.count()).isEqualTo(1);
-    }
-  }
-
-  @Test
-  public void setLockTimeout() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      txn.setLockTimeout(1000);
-    }
-  }
-
-  @Test
-  public void writeOptions() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final WriteOptions writeOptions = new WriteOptions()
-        .setDisableWAL(true)
-        .setSync(true);
-        final Transaction txn = dbContainer.beginTransaction(writeOptions)) {
-
-      txn.put(k1, v1);
-
-      WriteOptions txnWriteOptions = txn.getWriteOptions();
-      assertThat(txnWriteOptions).isNotNull();
-      assertThat(txnWriteOptions.isOwningHandle()).isFalse();
-      assertThat(txnWriteOptions).isNotSameAs(writeOptions);
-      assertThat(txnWriteOptions.disableWAL()).isTrue();
-      assertThat(txnWriteOptions.sync()).isTrue();
-
-      txn.setWriteOptions(txnWriteOptions.setSync(false));
-      txnWriteOptions = txn.getWriteOptions();
-      assertThat(txnWriteOptions).isNotNull();
-      assertThat(txnWriteOptions.isOwningHandle()).isFalse();
-      assertThat(txnWriteOptions).isNotSameAs(writeOptions);
-      assertThat(txnWriteOptions.disableWAL()).isTrue();
-      assertThat(txnWriteOptions.sync()).isFalse();
-    }
-  }
-
-  @Test
-  public void undoGetForUpdate_cf() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      assertThat(txn.getForUpdate(readOptions, testCf, k1, true)).isNull();
-      txn.put(testCf, k1, v1);
-      assertThat(txn.getForUpdate(readOptions, testCf, k1, true)).isEqualTo(v1);
-      txn.undoGetForUpdate(testCf, k1);
-    }
-  }
-
-  @Test
-  public void undoGetForUpdate() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.getForUpdate(readOptions, k1, true)).isNull();
-      txn.put(k1, v1);
-      assertThat(txn.getForUpdate(readOptions, k1, true)).isEqualTo(v1);
-      txn.undoGetForUpdate(k1);
-    }
-  }
-
-  @Test
-  public void rebuildFromWriteBatch() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    final byte k2[] = "key2".getBytes(UTF_8);
-    final byte v2[] = "value2".getBytes(UTF_8);
-    final byte k3[] = "key3".getBytes(UTF_8);
-    final byte v3[] = "value3".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      txn.put(k1, v1);
-
-      assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-      assertThat(txn.getNumKeys()).isEqualTo(1);
-
-      try(final WriteBatch writeBatch = new WriteBatch()) {
-        writeBatch.put(k2, v2);
-        writeBatch.put(k3, v3);
-        txn.rebuildFromWriteBatch(writeBatch);
-
-        assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-        assertThat(txn.get(readOptions, k2)).isEqualTo(v2);
-        assertThat(txn.get(readOptions, k3)).isEqualTo(v3);
-        assertThat(txn.getNumKeys()).isEqualTo(3);
-      }
-    }
-  }
-
-  @Test
-  public void getCommitTimeWriteBatch() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-
-      txn.put(k1, v1);
-      final WriteBatch writeBatch = txn.getCommitTimeWriteBatch();
-
-      assertThat(writeBatch).isNotNull();
-      assertThat(writeBatch.isOwningHandle()).isFalse();
-      assertThat(writeBatch.count()).isEqualTo(0);
-    }
-  }
-
-  @Test
-  public void logNumber() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.getLogNumber()).isEqualTo(0);
-      final long logNumber = rand.nextLong();
-      txn.setLogNumber(logNumber);
-      assertThat(txn.getLogNumber()).isEqualTo(logNumber);
-    }
-  }
-
-  private static byte[] concat(final byte[][] bufs) {
-    int resultLength = 0;
-    for(final byte[] buf : bufs) {
-      resultLength += buf.length;
-    }
-
-    final byte[] result = new byte[resultLength];
-    int resultOffset = 0;
-    for(final byte[] buf : bufs) {
-      final int srcLength = buf.length;
-      System.arraycopy(buf, 0, result, resultOffset, srcLength);
-      resultOffset += srcLength;
-    }
-
-    return result;
-  }
-
-  private static class TestTransactionNotifier
-      extends AbstractTransactionNotifier {
-    private final List<Snapshot> createdSnapshots = new ArrayList<>();
-
-    @Override
-    public void snapshotCreated(final Snapshot newSnapshot) {
-      createdSnapshots.add(newSnapshot);
-    }
-
-    public List<Snapshot> getCreatedSnapshots() {
-      return createdSnapshots;
-    }
-  }
-
-  protected static abstract class DBContainer
-      implements AutoCloseable {
-    protected final WriteOptions writeOptions;
-    protected final List<ColumnFamilyHandle> columnFamilyHandles;
-    protected final ColumnFamilyOptions columnFamilyOptions;
-    protected final DBOptions options;
-
-    public DBContainer(final WriteOptions writeOptions,
-        final List<ColumnFamilyHandle> columnFamilyHandles,
-        final ColumnFamilyOptions columnFamilyOptions,
-        final DBOptions options) {
-      this.writeOptions = writeOptions;
-      this.columnFamilyHandles = columnFamilyHandles;
-      this.columnFamilyOptions = columnFamilyOptions;
-      this.options = options;
-    }
-
-    public abstract Transaction beginTransaction();
-
-    public abstract Transaction beginTransaction(
-        final WriteOptions writeOptions);
-
-    public ColumnFamilyHandle getTestColumnFamily() {
-      return columnFamilyHandles.get(1);
-    }
-
-    @Override
-    public abstract void close();
-  }
-}

java/src/test/java/org/rocksdb/ColumnFamilyTest.java

@@ -12,7 +12,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ColumnFamilyTest {
@@ -24,31 +23,6 @@ public class ColumnFamilyTest {
   @Rule
   public TemporaryFolder dbFolder = new TemporaryFolder();
 
-  @Test
-  public void columnFamilyDescriptorName() throws RocksDBException {
-    final byte[] cfName = "some_name".getBytes(UTF_8);
-
-    try(final ColumnFamilyOptions cfOptions = new ColumnFamilyOptions()) {
-      final ColumnFamilyDescriptor cfDescriptor =
-              new ColumnFamilyDescriptor(cfName, cfOptions);
-      assertThat(cfDescriptor.getName()).isEqualTo(cfName);
-    }
-  }
-
-  @Test
-  public void columnFamilyDescriptorOptions() throws RocksDBException {
-    final byte[] cfName = "some_name".getBytes(UTF_8);
-
-    try(final ColumnFamilyOptions cfOptions = new ColumnFamilyOptions()
-            .setCompressionType(CompressionType.BZLIB2_COMPRESSION)) {
-      final ColumnFamilyDescriptor cfDescriptor =
-          new ColumnFamilyDescriptor(cfName, cfOptions);
-
-        assertThat(cfDescriptor.getOptions().compressionType())
-            .isEqualTo(CompressionType.BZLIB2_COMPRESSION);
-    }
-  }
-
   @Test
   public void listColumnFamilies() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
@@ -73,9 +47,6 @@ public class ColumnFamilyTest {
       try {
         assertThat(cfh).isNotNull();
 
-        assertThat(cfh.getName()).isEqualTo("default".getBytes(UTF_8));
-        assertThat(cfh.getID()).isEqualTo(0);
-
         final byte[] key = "key".getBytes();
         final byte[] value = "value".getBytes();
 
@@ -93,25 +64,15 @@ public class ColumnFamilyTest {
 
   @Test
   public void createColumnFamily() throws RocksDBException {
-    final byte[] cfName = "new_cf".getBytes(UTF_8);
-    final ColumnFamilyDescriptor cfDescriptor = new ColumnFamilyDescriptor(cfName,
-            new ColumnFamilyOptions());
-
     try (final Options options = new Options().setCreateIfMissing(true);
          final RocksDB db = RocksDB.open(options,
-                 dbFolder.getRoot().getAbsolutePath())) {
-
-      final ColumnFamilyHandle columnFamilyHandle = db.createColumnFamily(cfDescriptor);
-
+             dbFolder.getRoot().getAbsolutePath())) {
+      final ColumnFamilyHandle columnFamilyHandle = db.createColumnFamily(
+          new ColumnFamilyDescriptor("new_cf".getBytes(),
+              new ColumnFamilyOptions()));
       try {
-        assertThat(columnFamilyHandle.getName()).isEqualTo(cfName);
-        assertThat(columnFamilyHandle.getID()).isEqualTo(1);
-
-        final ColumnFamilyDescriptor latestDescriptor = columnFamilyHandle.getDescriptor();
-        assertThat(latestDescriptor.getName()).isEqualTo(cfName);
-
         final List<byte[]> columnFamilyNames = RocksDB.listColumnFamilies(
-                options, dbFolder.getRoot().getAbsolutePath());
+            options, dbFolder.getRoot().getAbsolutePath());
         assertThat(columnFamilyNames).isNotNull();
         assertThat(columnFamilyNames.size()).isGreaterThan(0);
         assertThat(columnFamilyNames.size()).isEqualTo(2);

java/src/test/java/org/rocksdb/NativeComparatorWrapperTest.java

@@ -1,92 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.util.*;
-import java.util.Comparator;
-
-import static org.junit.Assert.assertEquals;
-
-public class NativeComparatorWrapperTest {
-
-  @Rule
-  public TemporaryFolder dbFolder = new TemporaryFolder();
-
-  private static final Random random = new Random();
-
-  @Test
-  public void rountrip() throws RocksDBException {
-    final String dbPath = dbFolder.getRoot().getAbsolutePath();
-    final int ITERATIONS = 1_000;
-
-    final String[] storedKeys = new String[ITERATIONS];
-    try (final NativeStringComparatorWrapper comparator = new NativeStringComparatorWrapper();
-        final Options opt = new Options()
-        .setCreateIfMissing(true)
-        .setComparator(comparator)) {
-
-      // store random integer keys
-      try (final RocksDB db = RocksDB.open(opt, dbPath)) {
-        for (int i = 0; i < ITERATIONS; i++) {
-          final String strKey = randomString();
-          final byte key[] = strKey.getBytes();
-          // does key already exist (avoid duplicates)
-          if (i > 0 && db.get(key) != null) {
-            i--; // generate a different key
-          } else {
-            db.put(key, "value".getBytes());
-            storedKeys[i] = strKey;
-          }
-        }
-      }
-
-      // sort the stored keys into ascending alpha-numeric order
-      Arrays.sort(storedKeys, new Comparator<String>() {
-        @Override
-        public int compare(final String o1, final String o2) {
-          return o1.compareTo(o2);
-        }
-      });
-
-      // re-open db and read from start to end
-      // string keys should be in ascending
-      // order
-      try (final RocksDB db = RocksDB.open(opt, dbPath);
-           final RocksIterator it = db.newIterator()) {
-        int count = 0;
-        for (it.seekToFirst(); it.isValid(); it.next()) {
-          final String strKey = new String(it.key());
-          assertEquals(storedKeys[count++], strKey);
-        }
-      }
-    }
-  }
-
-  private String randomString() {
-    final char[] chars = new char[12];
-    for(int i = 0; i < 12; i++) {
-      final int letterCode = random.nextInt(24);
-      final char letter = (char) (((int) 'a') + letterCode);
-      chars[i] = letter;
-    }
-    return String.copyValueOf(chars);
-  }
-
-  public static class NativeStringComparatorWrapper
-      extends NativeComparatorWrapper {
-
-    @Override
-    protected long initializeNative(final long... nativeParameterHandles) {
-      return newStringComparator();
-    }
-
-    private native long newStringComparator();
-  }
-}

java/src/test/java/org/rocksdb/OptimisticTransactionDBTest.java

@@ -1,131 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class OptimisticTransactionDBTest {
-
-  @Rule
-  public TemporaryFolder dbFolder = new TemporaryFolder();
-
-  @Test
-  public void open() throws RocksDBException {
-    try (final Options options = new Options().setCreateIfMissing(true);
-         final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(options,
-                 dbFolder.getRoot().getAbsolutePath())) {
-      assertThat(otdb).isNotNull();
-    }
-  }
-
-  @Test
-  public void open_columnFamilies() throws RocksDBException {
-    try(final DBOptions dbOptions = new DBOptions().setCreateIfMissing(true)
-          .setCreateMissingColumnFamilies(true);
-        final ColumnFamilyOptions myCfOpts = new ColumnFamilyOptions()) {
-
-      final List<ColumnFamilyDescriptor> columnFamilyDescriptors =
-          Arrays.asList(
-              new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
-              new ColumnFamilyDescriptor("myCf".getBytes(), myCfOpts));
-
-      final List<ColumnFamilyHandle> columnFamilyHandles = new ArrayList<>();
-
-      try (final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(dbOptions,
-               dbFolder.getRoot().getAbsolutePath(),
-               columnFamilyDescriptors, columnFamilyHandles)) {
-        try {
-          assertThat(otdb).isNotNull();
-        } finally {
-          for (final ColumnFamilyHandle handle : columnFamilyHandles) {
-            handle.close();
-          }
-        }
-      }
-    }
-  }
-
-  @Test
-  public void beginTransaction() throws RocksDBException {
-    try (final Options options = new Options().setCreateIfMissing(true);
-         final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(
-             options, dbFolder.getRoot().getAbsolutePath());
-        final WriteOptions writeOptions = new WriteOptions()) {
-
-      try(final Transaction txn = otdb.beginTransaction(writeOptions)) {
-        assertThat(txn).isNotNull();
-      }
-    }
-  }
-
-  @Test
-  public void beginTransaction_transactionOptions() throws RocksDBException {
-    try (final Options options = new Options().setCreateIfMissing(true);
-         final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(
-             options, dbFolder.getRoot().getAbsolutePath());
-         final WriteOptions writeOptions = new WriteOptions();
-         final OptimisticTransactionOptions optimisticTxnOptions =
-             new OptimisticTransactionOptions()) {
-
-      try(final Transaction txn = otdb.beginTransaction(writeOptions,
-          optimisticTxnOptions)) {
-        assertThat(txn).isNotNull();
-      }
-    }
-  }
-
-  @Test
-  public void beginTransaction_withOld() throws RocksDBException {
-    try (final Options options = new Options().setCreateIfMissing(true);
-         final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(
-             options, dbFolder.getRoot().getAbsolutePath());
-         final WriteOptions writeOptions = new WriteOptions()) {
-
-      try(final Transaction txn = otdb.beginTransaction(writeOptions)) {
-        final Transaction txnReused = otdb.beginTransaction(writeOptions, txn);
-        assertThat(txnReused).isSameAs(txn);
-      }
-    }
-  }
-
-  @Test
-  public void beginTransaction_withOld_transactionOptions()
-      throws RocksDBException {
-    try (final Options options = new Options().setCreateIfMissing(true);
-         final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(
-             options, dbFolder.getRoot().getAbsolutePath());
-         final WriteOptions writeOptions = new WriteOptions();
-         final OptimisticTransactionOptions optimisticTxnOptions =
-             new OptimisticTransactionOptions()) {
-
-      try(final Transaction txn = otdb.beginTransaction(writeOptions)) {
-        final Transaction txnReused = otdb.beginTransaction(writeOptions,
-            optimisticTxnOptions, txn);
-        assertThat(txnReused).isSameAs(txn);
-      }
-    }
-  }
-
-  @Test
-  public void baseDB() throws RocksDBException {
-    try (final Options options = new Options().setCreateIfMissing(true);
-         final OptimisticTransactionDB otdb = OptimisticTransactionDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
-      assertThat(otdb).isNotNull();
-      final RocksDB db = otdb.getBaseDB();
-      assertThat(db).isNotNull();
-      assertThat(db.isOwningHandle()).isFalse();
-    }
-  }
-}

java/src/test/java/org/rocksdb/OptimisticTransactionOptionsTest.java

@@ -1,37 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import org.junit.Test;
-import org.rocksdb.util.DirectBytewiseComparator;
-
-import java.util.Random;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class OptimisticTransactionOptionsTest {
-
-  private static final Random rand = PlatformRandomHelper.
-      getPlatformSpecificRandomFactory();
-
-  @Test
-  public void setSnapshot() {
-    try (final OptimisticTransactionOptions opt = new OptimisticTransactionOptions()) {
-      final boolean boolValue = rand.nextBoolean();
-      opt.setSetSnapshot(boolValue);
-      assertThat(opt.isSetSnapshot()).isEqualTo(boolValue);
-    }
-  }
-
-  @Test
-  public void comparator() {
-    try (final OptimisticTransactionOptions opt = new OptimisticTransactionOptions();
-         final ComparatorOptions copt = new ComparatorOptions();
-         final DirectComparator comparator = new DirectBytewiseComparator(copt)) {
-      opt.setComparator(comparator);
-    }
-  }
-}

java/src/test/java/org/rocksdb/OptimisticTransactionTest.java

@@ -1,350 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-public class OptimisticTransactionTest extends AbstractTransactionTest {
-
-  @Test
-  public void getForUpdate_cf_conflict() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    final byte v12[] = "value12".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(testCf, k1, v1);
-        assertThat(txn.get(testCf, readOptions, k1)).isEqualTo(v1);
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        try(final Transaction txn3 = dbContainer.beginTransaction()) {
-          assertThat(txn3.getForUpdate(readOptions, testCf, k1, true)).isEqualTo(v1);
-
-          // NOTE: txn2 updates k1, during txn3
-          txn2.put(testCf, k1, v12);
-          assertThat(txn2.get(testCf, readOptions, k1)).isEqualTo(v12);
-          txn2.commit();
-
-          try {
-            txn3.commit(); // should cause an exception!
-          } catch(final RocksDBException e) {
-            assertThat(e.getStatus().getCode()).isSameAs(Status.Code.Busy);
-            return;
-          }
-        }
-      }
-
-      fail("Expected an exception for put after getForUpdate from conflicting" +
-          "transactions");
-    }
-  }
-
-  @Test
-  public void getForUpdate_conflict() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    final byte v12[] = "value12".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(k1, v1);
-        assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        try(final Transaction txn3 = dbContainer.beginTransaction()) {
-          assertThat(txn3.getForUpdate(readOptions, k1, true)).isEqualTo(v1);
-
-          // NOTE: txn2 updates k1, during txn3
-          txn2.put(k1, v12);
-          assertThat(txn2.get(readOptions, k1)).isEqualTo(v12);
-          txn2.commit();
-
-          try {
-            txn3.commit(); // should cause an exception!
-          } catch(final RocksDBException e) {
-            assertThat(e.getStatus().getCode()).isSameAs(Status.Code.Busy);
-            return;
-          }
-        }
-      }
-
-      fail("Expected an exception for put after getForUpdate from conflicting" +
-          "transactions");
-    }
-  }
-
-  @Test
-  public void multiGetForUpdate_cf_conflict() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-    final byte[] otherValue = "otherValue".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-      final List<ColumnFamilyHandle> cfList = Arrays.asList(testCf, testCf);
-
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(testCf, keys[0], values[0]);
-        txn.put(testCf, keys[1], values[1]);
-        assertThat(txn.multiGet(readOptions, cfList, keys)).isEqualTo(values);
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        try(final Transaction txn3 = dbContainer.beginTransaction()) {
-          assertThat(txn3.multiGetForUpdate(readOptions, cfList, keys))
-              .isEqualTo(values);
-
-          // NOTE: txn2 updates k1, during txn3
-          txn2.put(testCf, keys[0], otherValue);
-          assertThat(txn2.get(testCf, readOptions, keys[0]))
-              .isEqualTo(otherValue);
-          txn2.commit();
-
-          try {
-            txn3.commit(); // should cause an exception!
-          } catch(final RocksDBException e) {
-            assertThat(e.getStatus().getCode()).isSameAs(Status.Code.Busy);
-            return;
-          }
-        }
-      }
-
-      fail("Expected an exception for put after getForUpdate from conflicting" +
-          "transactions");
-    }
-  }
-
-  @Test
-  public void multiGetForUpdate_conflict() throws RocksDBException {
-    final byte keys[][] = new byte[][] {
-        "key1".getBytes(UTF_8),
-        "key2".getBytes(UTF_8)};
-    final byte values[][] = new byte[][] {
-        "value1".getBytes(UTF_8),
-        "value2".getBytes(UTF_8)};
-    final byte[] otherValue = "otherValue".getBytes(UTF_8);
-
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(keys[0], values[0]);
-        txn.put(keys[1], values[1]);
-        assertThat(txn.multiGet(readOptions, keys)).isEqualTo(values);
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        try(final Transaction txn3 = dbContainer.beginTransaction()) {
-          assertThat(txn3.multiGetForUpdate(readOptions, keys))
-              .isEqualTo(values);
-
-          // NOTE: txn2 updates k1, during txn3
-          txn2.put(keys[0], otherValue);
-          assertThat(txn2.get(readOptions, keys[0]))
-              .isEqualTo(otherValue);
-          txn2.commit();
-
-          try {
-            txn3.commit(); // should cause an exception!
-          } catch(final RocksDBException e) {
-            assertThat(e.getStatus().getCode()).isSameAs(Status.Code.Busy);
-            return;
-          }
-        }
-      }
-
-      fail("Expected an exception for put after getForUpdate from conflicting" +
-          "transactions");
-    }
-  }
-
-  @Test
-  public void undoGetForUpdate_cf_conflict() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    final byte v12[] = "value12".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-      final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
-
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(testCf, k1, v1);
-        assertThat(txn.get(testCf, readOptions, k1)).isEqualTo(v1);
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        try(final Transaction txn3 = dbContainer.beginTransaction()) {
-          assertThat(txn3.getForUpdate(readOptions, testCf, k1, true)).isEqualTo(v1);
-
-          // undo the getForUpdate
-          txn3.undoGetForUpdate(testCf, k1);
-
-          // NOTE: txn2 updates k1, during txn3
-          txn2.put(testCf, k1, v12);
-          assertThat(txn2.get(testCf, readOptions, k1)).isEqualTo(v12);
-          txn2.commit();
-
-          // should not cause an exception
-          // because we undid the getForUpdate above!
-          txn3.commit();
-        }
-      }
-    }
-  }
-
-  @Test
-  public void undoGetForUpdate_conflict() throws RocksDBException {
-    final byte k1[] = "key1".getBytes(UTF_8);
-    final byte v1[] = "value1".getBytes(UTF_8);
-    final byte v12[] = "value12".getBytes(UTF_8);
-    try(final DBContainer dbContainer = startDb();
-        final ReadOptions readOptions = new ReadOptions()) {
-
-      try(final Transaction txn = dbContainer.beginTransaction()) {
-        txn.put(k1, v1);
-        assertThat(txn.get(readOptions, k1)).isEqualTo(v1);
-        txn.commit();
-      }
-
-      try(final Transaction txn2 = dbContainer.beginTransaction()) {
-        try(final Transaction txn3 = dbContainer.beginTransaction()) {
-          assertThat(txn3.getForUpdate(readOptions, k1, true)).isEqualTo(v1);
-
-          // undo the getForUpdate
-          txn3.undoGetForUpdate(k1);
-
-          // NOTE: txn2 updates k1, during txn3
-          txn2.put(k1, v12);
-          assertThat(txn2.get(readOptions, k1)).isEqualTo(v12);
-          txn2.commit();
-
-          // should not cause an exception
-          // because we undid the getForUpdate above!
-          txn3.commit();
-        }
-      }
-    }
-  }
-
-  @Test
-  public void name() throws RocksDBException {
-    try(final DBContainer dbContainer = startDb();
-        final Transaction txn = dbContainer.beginTransaction()) {
-      assertThat(txn.getName()).isEmpty();
-      final String name = "my-transaction-" + rand.nextLong();
-
-      try {
-        txn.setName(name);
-      } catch(final RocksDBException e) {
-         assertThat(e.getStatus().getCode() == Status.Code.InvalidArgument);
-        return;
-      }
-
-      fail("Optimistic transactions cannot be named.");
-    }
-  }
-
-  @Override
-  public OptimisticTransactionDBContainer startDb()
-      throws RocksDBException {
-    final DBOptions options = new DBOptions()
-        .setCreateIfMissing(true)
-        .setCreateMissingColumnFamilies(true);
-
-    final ColumnFamilyOptions columnFamilyOptions = new ColumnFamilyOptions();
-    final List<ColumnFamilyDescriptor> columnFamilyDescriptors =
-        Arrays.asList(
-            new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
-            new ColumnFamilyDescriptor(TXN_TEST_COLUMN_FAMILY,
-                columnFamilyOptions));
-    final List<ColumnFamilyHandle> columnFamilyHandles = new ArrayList<>();
-
-    final OptimisticTransactionDB optimisticTxnDb;
-    try {
-      optimisticTxnDb = OptimisticTransactionDB.open(
-          options, dbFolder.getRoot().getAbsolutePath(),
-          columnFamilyDescriptors, columnFamilyHandles);
-    } catch(final RocksDBException e) {
-      columnFamilyOptions.close();
-      options.close();
-      throw e;
-    }
-
-    final WriteOptions writeOptions = new WriteOptions();
-    final OptimisticTransactionOptions optimisticTxnOptions =
-             new OptimisticTransactionOptions();
-
-    return new OptimisticTransactionDBContainer(optimisticTxnOptions,
-        writeOptions, columnFamilyHandles, optimisticTxnDb, columnFamilyOptions,
-        options);
-  }
-
-  private static class OptimisticTransactionDBContainer
-      extends DBContainer {
-
-    private final OptimisticTransactionOptions optimisticTxnOptions;
-    private final OptimisticTransactionDB optimisticTxnDb;
-
-    public OptimisticTransactionDBContainer(
-        final OptimisticTransactionOptions optimisticTxnOptions,
-        final WriteOptions writeOptions,
-        final List<ColumnFamilyHandle> columnFamilyHandles,
-        final OptimisticTransactionDB optimisticTxnDb,
-        final ColumnFamilyOptions columnFamilyOptions,
-        final DBOptions options) {
-      super(writeOptions, columnFamilyHandles, columnFamilyOptions,
-          options);
-      this.optimisticTxnOptions = optimisticTxnOptions;
-      this.optimisticTxnDb = optimisticTxnDb;
-    }
-
-    @Override
-    public Transaction beginTransaction() {
-      return optimisticTxnDb.beginTransaction(writeOptions,
-          optimisticTxnOptions);
-    }
-
-    @Override
-    public Transaction beginTransaction(final WriteOptions writeOptions) {
-      return optimisticTxnDb.beginTransaction(writeOptions,
-          optimisticTxnOptions);
-    }
-
-    @Override
-    public void close() {
-      optimisticTxnOptions.close();
-      writeOptions.close();
-      for(final ColumnFamilyHandle columnFamilyHandle : columnFamilyHandles) {
-        columnFamilyHandle.close();
-      }
-      optimisticTxnDb.close();
-      options.close();
-    }
-  }
-}

java/src/test/java/org/rocksdb/RateLimiterTest.java

@@ -8,7 +8,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.rocksdb.RateLimiter.*;
 
 public class RateLimiterTest {
 
@@ -17,21 +16,17 @@ public class RateLimiterTest {
       new RocksMemoryResource();
 
   @Test
-  public void bytesPerSecond() {
+  public void setBytesPerSecond() {
     try(final RateLimiter rateLimiter =
-            new RateLimiter(1000, DEFAULT_REFILL_PERIOD_MICROS,
-                DEFAULT_FAIRNESS, DEFAULT_MODE, DEFAULT_AUTOTUNE)) {
-      assertThat(rateLimiter.getBytesPerSecond()).isGreaterThan(0);
+            new RateLimiter(1000, 100 * 1000, 1)) {
       rateLimiter.setBytesPerSecond(2000);
-      assertThat(rateLimiter.getBytesPerSecond()).isGreaterThan(0);
     }
   }
 
   @Test
   public void getSingleBurstBytes() {
     try(final RateLimiter rateLimiter =
-            new RateLimiter(1000, DEFAULT_REFILL_PERIOD_MICROS,
-                DEFAULT_FAIRNESS, DEFAULT_MODE, DEFAULT_AUTOTUNE)) {
+            new RateLimiter(1000, 100 * 1000, 1)) {
       assertThat(rateLimiter.getSingleBurstBytes()).isEqualTo(100);
     }
   }
@@ -39,8 +34,7 @@ public class RateLimiterTest {
   @Test
   public void getTotalBytesThrough() {
     try(final RateLimiter rateLimiter =
-            new RateLimiter(1000, DEFAULT_REFILL_PERIOD_MICROS,
-                DEFAULT_FAIRNESS, DEFAULT_MODE, DEFAULT_AUTOTUNE)) {
+            new RateLimiter(1000, 100 * 1000, 1)) {
       assertThat(rateLimiter.getTotalBytesThrough()).isEqualTo(0);
     }
   }
@@ -48,18 +42,8 @@ public class RateLimiterTest {
   @Test
   public void getTotalRequests() {
     try(final RateLimiter rateLimiter =
-            new RateLimiter(1000, DEFAULT_REFILL_PERIOD_MICROS,
-                DEFAULT_FAIRNESS, DEFAULT_MODE, DEFAULT_AUTOTUNE)) {
+            new RateLimiter(1000, 100 * 1000, 1)) {
       assertThat(rateLimiter.getTotalRequests()).isEqualTo(0);
     }
   }
-
-  @Test
-  public void autoTune() {
-    try(final RateLimiter rateLimiter =
-            new RateLimiter(1000, DEFAULT_REFILL_PERIOD_MICROS,
-                DEFAULT_FAIRNESS, DEFAULT_MODE, true)) {
-      assertThat(rateLimiter.getBytesPerSecond()).isGreaterThan(0);
-    }
-  }
 }

java/src/test/java/org/rocksdb/TransactionDBOptionsTest.java

@@ -1,64 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-package org.rocksdb;
-
-import org.junit.Test;
-
-import java.util.Random;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TransactionDBOptionsTest {
-
-  private static final Random rand = PlatformRandomHelper.
-      getPlatformSpecificRandomFactory();
-
-  @Test
-  public void maxNumLocks() {
-    try (final TransactionDBOptions opt = new TransactionDBOptions()) {
-      final long longValue = rand.nextLong();
-      opt.setMaxNumLocks(longValue);
-      assertThat(opt.getMaxNumLocks()).isEqualTo(longValue);
-    }
-  }
-
-  @Test
-  public void maxNumStripes() {
-    try (final TransactionDBOptions opt = new TransactionDBOptions()) {
-      final long longValue = rand.nextLong();
-      opt.setNumStripes(longValue);
-      assertThat(opt.getNumStripes()).isEqualTo(longValue);
-    }
-  }
-
-  @Test
-  public void transactionLockTimeout() {
-    try (final TransactionDBOptions opt = new TransactionDBOptions()) {
-      final long longValue = rand.nextLong();
-      opt.setTransactionLockTimeout(longValue);
-      assertThat(opt.getTransactionLockTimeout()).isEqualTo(longValue);
-    }
-  }
-
-  @Test
-  public void defaultLockTimeout() {
-    try (final TransactionDBOptions opt = new TransactionDBOptions()) {
-      final long longValue = rand.nextLong();
-      opt.setDefaultLockTimeout(longValue);
-      assertThat(opt.getDefaultLockTimeout()).isEqualTo(longValue);
-    }
-  }
-
-  @Test
-  public void writePolicy() {
-    try (final TransactionDBOptions opt = new TransactionDBOptions()) {
-      final TxnDBWritePolicy writePolicy = TxnDBWritePolicy.WRITE_UNPREPARED;  // non-default
-      opt.setWritePolicy(writePolicy);
-      assertThat(opt.getWritePolicy()).isEqualTo(writePolicy);
-    }
-  }
-
-}