|
|
|
cmake_minimum_required(VERSION 3.4)
|
|
|
|
|
|
|
|
if(${CMAKE_VERSION} VERSION_LESS "3.11.4")
|
|
|
|
message("Please consider switching to CMake 3.11.4 or newer")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set(CMAKE_JAVA_COMPILE_FLAGS -source 7)
|
|
|
|
|
|
|
|
set(JNI_NATIVE_SOURCES
|
|
|
|
rocksjni/backup_engine_options.cc
|
|
|
|
rocksjni/backupenginejni.cc
|
|
|
|
rocksjni/cassandra_compactionfilterjni.cc
|
|
|
|
rocksjni/cassandra_value_operator.cc
|
|
|
|
rocksjni/checkpoint.cc
|
|
|
|
rocksjni/clock_cache.cc
|
|
|
|
rocksjni/cache.cc
|
|
|
|
rocksjni/columnfamilyhandle.cc
|
|
|
|
rocksjni/compaction_filter.cc
|
|
|
|
rocksjni/compaction_filter_factory.cc
|
|
|
|
rocksjni/compaction_filter_factory_jnicallback.cc
|
|
|
|
rocksjni/compaction_job_info.cc
|
|
|
|
rocksjni/compaction_job_stats.cc
|
|
|
|
rocksjni/compaction_options.cc
|
|
|
|
rocksjni/compaction_options_fifo.cc
|
|
|
|
rocksjni/compaction_options_universal.cc
|
|
|
|
rocksjni/compact_range_options.cc
|
|
|
|
rocksjni/comparator.cc
|
|
|
|
rocksjni/comparatorjnicallback.cc
|
|
|
|
rocksjni/compression_options.cc
|
|
|
|
rocksjni/concurrent_task_limiter.cc
|
|
|
|
rocksjni/config_options.cc
|
|
|
|
rocksjni/env.cc
|
|
|
|
rocksjni/env_options.cc
|
|
|
|
rocksjni/event_listener.cc
|
|
|
|
rocksjni/event_listener_jnicallback.cc
|
|
|
|
rocksjni/filter.cc
|
|
|
|
rocksjni/ingest_external_file_options.cc
|
|
|
|
rocksjni/iterator.cc
|
|
|
|
rocksjni/jnicallback.cc
|
|
|
|
rocksjni/loggerjnicallback.cc
|
|
|
|
rocksjni/lru_cache.cc
|
|
|
|
rocksjni/memory_util.cc
|
|
|
|
rocksjni/memtablejni.cc
|
|
|
|
rocksjni/merge_operator.cc
|
|
|
|
rocksjni/native_comparator_wrapper_test.cc
|
|
|
|
rocksjni/optimistic_transaction_db.cc
|
|
|
|
rocksjni/optimistic_transaction_options.cc
|
|
|
|
rocksjni/options.cc
|
|
|
|
rocksjni/options_util.cc
|
|
|
|
rocksjni/persistent_cache.cc
|
|
|
|
rocksjni/ratelimiterjni.cc
|
|
|
|
rocksjni/remove_emptyvalue_compactionfilterjni.cc
|
|
|
|
rocksjni/restorejni.cc
|
|
|
|
rocksjni/rocks_callback_object.cc
|
|
|
|
rocksjni/rocksdb_exception_test.cc
|
|
|
|
rocksjni/rocksjni.cc
|
|
|
|
rocksjni/slice.cc
|
|
|
|
rocksjni/snapshot.cc
|
|
|
|
rocksjni/sst_file_manager.cc
|
|
|
|
rocksjni/sst_file_writerjni.cc
|
|
|
|
rocksjni/sst_file_readerjni.cc
|
|
|
|
rocksjni/sst_file_reader_iterator.cc
|
|
|
|
rocksjni/sst_partitioner.cc
|
|
|
|
rocksjni/statistics.cc
|
|
|
|
rocksjni/statisticsjni.cc
|
|
|
|
rocksjni/table.cc
|
|
|
|
rocksjni/table_filter.cc
|
|
|
|
rocksjni/table_filter_jnicallback.cc
|
|
|
|
rocksjni/testable_event_listener.cc
|
|
|
|
rocksjni/thread_status.cc
|
|
|
|
rocksjni/trace_writer.cc
|
|
|
|
rocksjni/trace_writer_jnicallback.cc
|
|
|
|
rocksjni/transaction.cc
|
|
|
|
rocksjni/transaction_db.cc
|
|
|
|
rocksjni/transaction_db_options.cc
|
|
|
|
rocksjni/transaction_log.cc
|
|
|
|
rocksjni/transaction_notifier.cc
|
|
|
|
rocksjni/transaction_notifier_jnicallback.cc
|
|
|
|
rocksjni/transaction_options.cc
|
|
|
|
rocksjni/ttl.cc
|
|
|
|
rocksjni/wal_filter.cc
|
|
|
|
rocksjni/wal_filter_jnicallback.cc
|
|
|
|
rocksjni/write_batch.cc
|
|
|
|
rocksjni/writebatchhandlerjnicallback.cc
|
|
|
|
rocksjni/write_batch_test.cc
|
|
|
|
rocksjni/write_batch_with_index.cc
|
|
|
|
rocksjni/write_buffer_manager.cc
|
|
|
|
)
|
|
|
|
|
|
|
|
set(JAVA_MAIN_CLASSES
|
|
|
|
src/main/java/org/rocksdb/AbstractCompactionFilter.java
|
|
|
|
src/main/java/org/rocksdb/AbstractCompactionFilterFactory.java
|
|
|
|
src/main/java/org/rocksdb/AbstractComparator.java
|
|
|
|
src/main/java/org/rocksdb/AbstractEventListener.java
|
|
|
|
src/main/java/org/rocksdb/AbstractImmutableNativeReference.java
|
|
|
|
src/main/java/org/rocksdb/AbstractMutableOptions.java
|
|
|
|
src/main/java/org/rocksdb/AbstractNativeReference.java
|
|
|
|
src/main/java/org/rocksdb/AbstractRocksIterator.java
|
|
|
|
src/main/java/org/rocksdb/AbstractSlice.java
|
|
|
|
src/main/java/org/rocksdb/AbstractTableFilter.java
|
|
|
|
src/main/java/org/rocksdb/AbstractTraceWriter.java
|
|
|
|
src/main/java/org/rocksdb/AbstractTransactionNotifier.java
|
|
|
|
src/main/java/org/rocksdb/AbstractWalFilter.java
|
|
|
|
src/main/java/org/rocksdb/AbstractWriteBatch.java
|
|
|
|
src/main/java/org/rocksdb/AccessHint.java
|
|
|
|
src/main/java/org/rocksdb/AdvancedColumnFamilyOptionsInterface.java
|
|
|
|
src/main/java/org/rocksdb/AdvancedMutableColumnFamilyOptionsInterface.java
|
|
|
|
src/main/java/org/rocksdb/BackgroundErrorReason.java
|
|
|
|
src/main/java/org/rocksdb/BackupEngineOptions.java
|
|
|
|
src/main/java/org/rocksdb/BackupEngine.java
|
|
|
|
src/main/java/org/rocksdb/BackupInfo.java
|
|
|
|
src/main/java/org/rocksdb/BlockBasedTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/BloomFilter.java
|
|
|
|
src/main/java/org/rocksdb/BuiltinComparator.java
|
|
|
|
src/main/java/org/rocksdb/ByteBufferGetStatus.java
|
|
|
|
src/main/java/org/rocksdb/Cache.java
|
|
|
|
src/main/java/org/rocksdb/CassandraCompactionFilter.java
|
|
|
|
src/main/java/org/rocksdb/CassandraValueMergeOperator.java
|
|
|
|
src/main/java/org/rocksdb/Checkpoint.java
|
|
|
|
src/main/java/org/rocksdb/ChecksumType.java
|
|
|
|
src/main/java/org/rocksdb/ClockCache.java
|
|
|
|
src/main/java/org/rocksdb/ColumnFamilyDescriptor.java
|
|
|
|
src/main/java/org/rocksdb/ColumnFamilyHandle.java
|
|
|
|
src/main/java/org/rocksdb/ColumnFamilyMetaData.java
|
|
|
|
src/main/java/org/rocksdb/ColumnFamilyOptionsInterface.java
|
|
|
|
src/main/java/org/rocksdb/ColumnFamilyOptions.java
|
|
|
|
src/main/java/org/rocksdb/CompactionJobInfo.java
|
|
|
|
src/main/java/org/rocksdb/CompactionJobStats.java
|
|
|
|
src/main/java/org/rocksdb/CompactionOptions.java
|
|
|
|
src/main/java/org/rocksdb/CompactionOptionsFIFO.java
|
|
|
|
src/main/java/org/rocksdb/CompactionOptionsUniversal.java
|
|
|
|
src/main/java/org/rocksdb/CompactionPriority.java
|
|
|
|
src/main/java/org/rocksdb/CompactionReason.java
|
|
|
|
src/main/java/org/rocksdb/CompactRangeOptions.java
|
|
|
|
src/main/java/org/rocksdb/CompactionStopStyle.java
|
|
|
|
src/main/java/org/rocksdb/CompactionStyle.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/ConfigOptions.java
|
|
|
|
src/main/java/org/rocksdb/DataBlockIndexType.java
|
|
|
|
src/main/java/org/rocksdb/DBOptionsInterface.java
|
|
|
|
src/main/java/org/rocksdb/DBOptions.java
|
|
|
|
src/main/java/org/rocksdb/DbPath.java
|
|
|
|
src/main/java/org/rocksdb/DirectSlice.java
|
|
|
|
src/main/java/org/rocksdb/EncodingType.java
|
|
|
|
src/main/java/org/rocksdb/Env.java
|
|
|
|
src/main/java/org/rocksdb/EnvOptions.java
|
|
|
|
src/main/java/org/rocksdb/EventListener.java
|
|
|
|
src/main/java/org/rocksdb/Experimental.java
|
|
|
|
src/main/java/org/rocksdb/ExternalFileIngestionInfo.java
|
|
|
|
src/main/java/org/rocksdb/Filter.java
|
|
|
|
src/main/java/org/rocksdb/FileOperationInfo.java
|
|
|
|
src/main/java/org/rocksdb/FlushJobInfo.java
|
|
|
|
src/main/java/org/rocksdb/FlushReason.java
|
|
|
|
src/main/java/org/rocksdb/FlushOptions.java
|
|
|
|
src/main/java/org/rocksdb/HashLinkedListMemTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/HashSkipListMemTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/HistogramData.java
|
|
|
|
src/main/java/org/rocksdb/HistogramType.java
|
|
|
|
src/main/java/org/rocksdb/Holder.java
|
|
|
|
src/main/java/org/rocksdb/IndexShorteningMode.java
|
|
|
|
src/main/java/org/rocksdb/IndexType.java
|
|
|
|
src/main/java/org/rocksdb/InfoLogLevel.java
|
|
|
|
src/main/java/org/rocksdb/IngestExternalFileOptions.java
|
|
|
|
src/main/java/org/rocksdb/LevelMetaData.java
|
|
|
|
src/main/java/org/rocksdb/ConcurrentTaskLimiter.java
|
|
|
|
src/main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java
|
|
|
|
src/main/java/org/rocksdb/KeyMayExist.java
|
|
|
|
src/main/java/org/rocksdb/LiveFileMetaData.java
|
|
|
|
src/main/java/org/rocksdb/LogFile.java
|
|
|
|
src/main/java/org/rocksdb/Logger.java
|
|
|
|
src/main/java/org/rocksdb/LRUCache.java
|
|
|
|
src/main/java/org/rocksdb/MemoryUsageType.java
|
|
|
|
src/main/java/org/rocksdb/MemoryUtil.java
|
|
|
|
src/main/java/org/rocksdb/MemTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/MemTableInfo.java
|
|
|
|
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/MutableDBOptions.java
|
|
|
|
src/main/java/org/rocksdb/MutableDBOptionsInterface.java
|
|
|
|
src/main/java/org/rocksdb/MutableOptionKey.java
|
|
|
|
src/main/java/org/rocksdb/MutableOptionValue.java
|
|
|
|
src/main/java/org/rocksdb/NativeComparatorWrapper.java
|
|
|
|
src/main/java/org/rocksdb/NativeLibraryLoader.java
|
|
|
|
src/main/java/org/rocksdb/OperationStage.java
|
|
|
|
src/main/java/org/rocksdb/OperationType.java
|
|
|
|
src/main/java/org/rocksdb/OptimisticTransactionDB.java
|
|
|
|
src/main/java/org/rocksdb/OptimisticTransactionOptions.java
|
|
|
|
src/main/java/org/rocksdb/Options.java
|
|
|
|
src/main/java/org/rocksdb/OptionString.java
|
|
|
|
src/main/java/org/rocksdb/OptionsUtil.java
|
|
|
|
src/main/java/org/rocksdb/PersistentCache.java
|
|
|
|
src/main/java/org/rocksdb/PlainTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/Priority.java
|
|
|
|
src/main/java/org/rocksdb/Range.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
|
|
|
|
src/main/java/org/rocksdb/RestoreOptions.java
|
Improve RocksJava Comparator (#6252)
Summary:
This is a redesign of the API for RocksJava comparators with the aim of improving performance. It also simplifies the class hierarchy.
**NOTE**: This breaks backwards compatibility for existing 3rd party Comparators implemented in Java... so we need to consider carefully which release branches this goes into.
Previously when implementing a comparator in Java the developer had a choice of subclassing either `DirectComparator` or `Comparator` which would use direct and non-direct byte-buffers resepectively (via `DirectSlice` and `Slice`).
In this redesign there we have eliminated the overhead of using the Java Slice classes, and just use `ByteBuffer`s. The `ComparatorOptions` supplied when constructing a Comparator allow you to choose between direct and non-direct byte buffers by setting `useDirect`.
In addition, the `ComparatorOptions` now allow you to choose whether a ByteBuffer is reused over multiple comparator calls, by setting `maxReusedBufferSize > 0`. When buffers are reused, ComparatorOptions provides a choice of mutex type by setting `useAdaptiveMutex`.
---
[JMH benchmarks previously indicated](https://github.com/facebook/rocksdb/pull/6241#issue-356398306) that the difference between C++ and Java for implementing a comparator was ~7x slowdown in Java.
With these changes, when reusing buffers and guarding access to them via mutexes the slowdown is approximately the same. However, these changes offer a new facility to not reuse mutextes, which reduces the slowdown to ~5.5x in Java. We also offer a `thread_local` mechanism for reusing buffers, which reduces slowdown to ~5.2x in Java (closes https://github.com/facebook/rocksdb/pull/4425).
These changes also form a good base for further optimisation work such as further JNI lookup caching, and JNI critical.
---
These numbers were captured without jemalloc. With jemalloc, the performance improves for all tests, and the Java slowdown reduces to between 4.8x and 5.x.
```
ComparatorBenchmarks.put native_bytewise thrpt 25 124483.795 ± 2032.443 ops/s
ComparatorBenchmarks.put native_reverse_bytewise thrpt 25 114414.536 ± 3486.156 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_adaptive-mutex thrpt 25 17228.250 ± 1288.546 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_non-adaptive-mutex thrpt 25 16035.865 ± 1248.099 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_thread-local thrpt 25 21571.500 ± 871.521 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_adaptive-mutex thrpt 25 23613.773 ± 8465.660 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_non-adaptive-mutex thrpt 25 16768.172 ± 5618.489 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_thread-local thrpt 25 23921.164 ± 8734.742 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_no-reuse thrpt 25 17899.684 ± 839.679 ops/s
ComparatorBenchmarks.put java_bytewise_direct_no-reuse thrpt 25 22148.316 ± 1215.527 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_adaptive-mutex thrpt 25 11311.126 ± 820.602 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_non-adaptive-mutex thrpt 25 11421.311 ± 807.210 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_thread-local thrpt 25 11554.005 ± 960.556 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_adaptive-mutex thrpt 25 22960.523 ± 1673.421 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_non-adaptive-mutex thrpt 25 18293.317 ± 1434.601 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_thread-local thrpt 25 24479.361 ± 2157.306 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_no-reuse thrpt 25 7942.286 ± 626.170 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_no-reuse thrpt 25 11781.955 ± 1019.843 ops/s
```
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6252
Differential Revision: D19331064
Pulled By: pdillinger
fbshipit-source-id: 1f3b794e6a14162b2c3ffb943e8c0e64a0c03738
5 years ago
|
|
|
src/main/java/org/rocksdb/ReusedSynchronisationType.java
|
|
|
|
src/main/java/org/rocksdb/RocksCallbackObject.java
|
|
|
|
src/main/java/org/rocksdb/RocksDBException.java
|
|
|
|
src/main/java/org/rocksdb/RocksDB.java
|
|
|
|
src/main/java/org/rocksdb/RocksEnv.java
|
|
|
|
src/main/java/org/rocksdb/RocksIteratorInterface.java
|
|
|
|
src/main/java/org/rocksdb/RocksIterator.java
|
|
|
|
src/main/java/org/rocksdb/RocksMemEnv.java
|
|
|
|
src/main/java/org/rocksdb/RocksMutableObject.java
|
|
|
|
src/main/java/org/rocksdb/RocksObject.java
|
|
|
|
src/main/java/org/rocksdb/SanityLevel.java
|
|
|
|
src/main/java/org/rocksdb/SizeApproximationFlag.java
|
|
|
|
src/main/java/org/rocksdb/SkipListMemTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/Slice.java
|
|
|
|
src/main/java/org/rocksdb/Snapshot.java
|
|
|
|
src/main/java/org/rocksdb/SstFileManager.java
|
|
|
|
src/main/java/org/rocksdb/SstFileMetaData.java
|
|
|
|
src/main/java/org/rocksdb/SstFileReader.java
|
|
|
|
src/main/java/org/rocksdb/SstFileReaderIterator.java
|
|
|
|
src/main/java/org/rocksdb/SstFileWriter.java
|
|
|
|
src/main/java/org/rocksdb/SstPartitionerFactory.java
|
|
|
|
src/main/java/org/rocksdb/SstPartitionerFixedPrefixFactory.java
|
|
|
|
src/main/java/org/rocksdb/StateType.java
|
|
|
|
src/main/java/org/rocksdb/StatisticsCollectorCallback.java
|
|
|
|
src/main/java/org/rocksdb/StatisticsCollector.java
|
|
|
|
src/main/java/org/rocksdb/Statistics.java
|
|
|
|
src/main/java/org/rocksdb/StatsCollectorInput.java
|
|
|
|
src/main/java/org/rocksdb/StatsLevel.java
|
|
|
|
src/main/java/org/rocksdb/Status.java
|
|
|
|
src/main/java/org/rocksdb/StringAppendOperator.java
|
|
|
|
src/main/java/org/rocksdb/TableFileCreationBriefInfo.java
|
|
|
|
src/main/java/org/rocksdb/TableFileCreationInfo.java
|
|
|
|
src/main/java/org/rocksdb/TableFileCreationReason.java
|
|
|
|
src/main/java/org/rocksdb/TableFileDeletionInfo.java
|
|
|
|
src/main/java/org/rocksdb/TableFilter.java
|
|
|
|
src/main/java/org/rocksdb/TableProperties.java
|
|
|
|
src/main/java/org/rocksdb/TableFormatConfig.java
|
|
|
|
src/main/java/org/rocksdb/ThreadType.java
|
|
|
|
src/main/java/org/rocksdb/ThreadStatus.java
|
|
|
|
src/main/java/org/rocksdb/TickerType.java
|
|
|
|
src/main/java/org/rocksdb/TimedEnv.java
|
|
|
|
src/main/java/org/rocksdb/TraceOptions.java
|
|
|
|
src/main/java/org/rocksdb/TraceWriter.java
|
|
|
|
src/main/java/org/rocksdb/TransactionalDB.java
|
|
|
|
src/main/java/org/rocksdb/TransactionalOptions.java
|
|
|
|
src/main/java/org/rocksdb/TransactionDB.java
|
|
|
|
src/main/java/org/rocksdb/TransactionDBOptions.java
|
|
|
|
src/main/java/org/rocksdb/Transaction.java
|
|
|
|
src/main/java/org/rocksdb/TransactionLogIterator.java
|
|
|
|
src/main/java/org/rocksdb/TransactionOptions.java
|
|
|
|
src/main/java/org/rocksdb/TtlDB.java
|
|
|
|
src/main/java/org/rocksdb/TxnDBWritePolicy.java
|
|
|
|
src/main/java/org/rocksdb/VectorMemTableConfig.java
|
|
|
|
src/main/java/org/rocksdb/WalFileType.java
|
|
|
|
src/main/java/org/rocksdb/WalFilter.java
|
|
|
|
src/main/java/org/rocksdb/WalProcessingOption.java
|
|
|
|
src/main/java/org/rocksdb/WALRecoveryMode.java
|
|
|
|
src/main/java/org/rocksdb/WBWIRocksIterator.java
|
|
|
|
src/main/java/org/rocksdb/WriteBatch.java
|
|
|
|
src/main/java/org/rocksdb/WriteBatchInterface.java
|
|
|
|
src/main/java/org/rocksdb/WriteBatchWithIndex.java
|
|
|
|
src/main/java/org/rocksdb/WriteOptions.java
|
|
|
|
src/main/java/org/rocksdb/WriteBufferManager.java
|
|
|
|
src/main/java/org/rocksdb/WriteStallCondition.java
|
|
|
|
src/main/java/org/rocksdb/WriteStallInfo.java
|
Improve RocksJava Comparator (#6252)
Summary:
This is a redesign of the API for RocksJava comparators with the aim of improving performance. It also simplifies the class hierarchy.
**NOTE**: This breaks backwards compatibility for existing 3rd party Comparators implemented in Java... so we need to consider carefully which release branches this goes into.
Previously when implementing a comparator in Java the developer had a choice of subclassing either `DirectComparator` or `Comparator` which would use direct and non-direct byte-buffers resepectively (via `DirectSlice` and `Slice`).
In this redesign there we have eliminated the overhead of using the Java Slice classes, and just use `ByteBuffer`s. The `ComparatorOptions` supplied when constructing a Comparator allow you to choose between direct and non-direct byte buffers by setting `useDirect`.
In addition, the `ComparatorOptions` now allow you to choose whether a ByteBuffer is reused over multiple comparator calls, by setting `maxReusedBufferSize > 0`. When buffers are reused, ComparatorOptions provides a choice of mutex type by setting `useAdaptiveMutex`.
---
[JMH benchmarks previously indicated](https://github.com/facebook/rocksdb/pull/6241#issue-356398306) that the difference between C++ and Java for implementing a comparator was ~7x slowdown in Java.
With these changes, when reusing buffers and guarding access to them via mutexes the slowdown is approximately the same. However, these changes offer a new facility to not reuse mutextes, which reduces the slowdown to ~5.5x in Java. We also offer a `thread_local` mechanism for reusing buffers, which reduces slowdown to ~5.2x in Java (closes https://github.com/facebook/rocksdb/pull/4425).
These changes also form a good base for further optimisation work such as further JNI lookup caching, and JNI critical.
---
These numbers were captured without jemalloc. With jemalloc, the performance improves for all tests, and the Java slowdown reduces to between 4.8x and 5.x.
```
ComparatorBenchmarks.put native_bytewise thrpt 25 124483.795 ± 2032.443 ops/s
ComparatorBenchmarks.put native_reverse_bytewise thrpt 25 114414.536 ± 3486.156 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_adaptive-mutex thrpt 25 17228.250 ± 1288.546 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_non-adaptive-mutex thrpt 25 16035.865 ± 1248.099 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_thread-local thrpt 25 21571.500 ± 871.521 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_adaptive-mutex thrpt 25 23613.773 ± 8465.660 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_non-adaptive-mutex thrpt 25 16768.172 ± 5618.489 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_thread-local thrpt 25 23921.164 ± 8734.742 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_no-reuse thrpt 25 17899.684 ± 839.679 ops/s
ComparatorBenchmarks.put java_bytewise_direct_no-reuse thrpt 25 22148.316 ± 1215.527 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_adaptive-mutex thrpt 25 11311.126 ± 820.602 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_non-adaptive-mutex thrpt 25 11421.311 ± 807.210 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_thread-local thrpt 25 11554.005 ± 960.556 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_adaptive-mutex thrpt 25 22960.523 ± 1673.421 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_non-adaptive-mutex thrpt 25 18293.317 ± 1434.601 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_thread-local thrpt 25 24479.361 ± 2157.306 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_no-reuse thrpt 25 7942.286 ± 626.170 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_no-reuse thrpt 25 11781.955 ± 1019.843 ops/s
```
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6252
Differential Revision: D19331064
Pulled By: pdillinger
fbshipit-source-id: 1f3b794e6a14162b2c3ffb943e8c0e64a0c03738
5 years ago
|
|
|
src/main/java/org/rocksdb/util/ByteUtil.java
|
|
|
|
src/main/java/org/rocksdb/util/BytewiseComparator.java
|
|
|
|
src/main/java/org/rocksdb/util/Environment.java
|
Improve RocksJava Comparator (#6252)
Summary:
This is a redesign of the API for RocksJava comparators with the aim of improving performance. It also simplifies the class hierarchy.
**NOTE**: This breaks backwards compatibility for existing 3rd party Comparators implemented in Java... so we need to consider carefully which release branches this goes into.
Previously when implementing a comparator in Java the developer had a choice of subclassing either `DirectComparator` or `Comparator` which would use direct and non-direct byte-buffers resepectively (via `DirectSlice` and `Slice`).
In this redesign there we have eliminated the overhead of using the Java Slice classes, and just use `ByteBuffer`s. The `ComparatorOptions` supplied when constructing a Comparator allow you to choose between direct and non-direct byte buffers by setting `useDirect`.
In addition, the `ComparatorOptions` now allow you to choose whether a ByteBuffer is reused over multiple comparator calls, by setting `maxReusedBufferSize > 0`. When buffers are reused, ComparatorOptions provides a choice of mutex type by setting `useAdaptiveMutex`.
---
[JMH benchmarks previously indicated](https://github.com/facebook/rocksdb/pull/6241#issue-356398306) that the difference between C++ and Java for implementing a comparator was ~7x slowdown in Java.
With these changes, when reusing buffers and guarding access to them via mutexes the slowdown is approximately the same. However, these changes offer a new facility to not reuse mutextes, which reduces the slowdown to ~5.5x in Java. We also offer a `thread_local` mechanism for reusing buffers, which reduces slowdown to ~5.2x in Java (closes https://github.com/facebook/rocksdb/pull/4425).
These changes also form a good base for further optimisation work such as further JNI lookup caching, and JNI critical.
---
These numbers were captured without jemalloc. With jemalloc, the performance improves for all tests, and the Java slowdown reduces to between 4.8x and 5.x.
```
ComparatorBenchmarks.put native_bytewise thrpt 25 124483.795 ± 2032.443 ops/s
ComparatorBenchmarks.put native_reverse_bytewise thrpt 25 114414.536 ± 3486.156 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_adaptive-mutex thrpt 25 17228.250 ± 1288.546 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_non-adaptive-mutex thrpt 25 16035.865 ± 1248.099 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_reused-64_thread-local thrpt 25 21571.500 ± 871.521 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_adaptive-mutex thrpt 25 23613.773 ± 8465.660 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_non-adaptive-mutex thrpt 25 16768.172 ± 5618.489 ops/s
ComparatorBenchmarks.put java_bytewise_direct_reused-64_thread-local thrpt 25 23921.164 ± 8734.742 ops/s
ComparatorBenchmarks.put java_bytewise_non-direct_no-reuse thrpt 25 17899.684 ± 839.679 ops/s
ComparatorBenchmarks.put java_bytewise_direct_no-reuse thrpt 25 22148.316 ± 1215.527 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_adaptive-mutex thrpt 25 11311.126 ± 820.602 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_non-adaptive-mutex thrpt 25 11421.311 ± 807.210 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_reused-64_thread-local thrpt 25 11554.005 ± 960.556 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_adaptive-mutex thrpt 25 22960.523 ± 1673.421 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_non-adaptive-mutex thrpt 25 18293.317 ± 1434.601 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_reused-64_thread-local thrpt 25 24479.361 ± 2157.306 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_non-direct_no-reuse thrpt 25 7942.286 ± 626.170 ops/s
ComparatorBenchmarks.put java_reverse_bytewise_direct_no-reuse thrpt 25 11781.955 ± 1019.843 ops/s
```
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6252
Differential Revision: D19331064
Pulled By: pdillinger
fbshipit-source-id: 1f3b794e6a14162b2c3ffb943e8c0e64a0c03738
5 years ago
|
|
|
src/main/java/org/rocksdb/util/IntComparator.java
|
|
|
|
src/main/java/org/rocksdb/util/ReverseBytewiseComparator.java
|
|
|
|
src/main/java/org/rocksdb/util/SizeUnit.java
|
|
|
|
src/main/java/org/rocksdb/UInt64AddOperator.java
|
|
|
|
)
|
|
|
|
|
|
|
|
set(JAVA_TEST_CLASSES
|
|
|
|
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/RocksNativeLibraryResource.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
|
|
|
|
src/test/java/org/rocksdb/test/TestableEventListener.java
|
|
|
|
)
|
|
|
|
|
|
|
|
include(FindJava)
|
|
|
|
include(UseJava)
|
|
|
|
find_package(JNI)
|
|
|
|
|
|
|
|
include_directories(${JNI_INCLUDE_DIRS})
|
|
|
|
include_directories(${PROJECT_SOURCE_DIR}/java)
|
|
|
|
|
|
|
|
set(JAVA_TEST_LIBDIR ${PROJECT_SOURCE_DIR}/java/test-libs)
|
|
|
|
set(JAVA_TMP_JAR ${JAVA_TEST_LIBDIR}/tmp.jar)
|
|
|
|
set(JAVA_JUNIT_JAR ${JAVA_TEST_LIBDIR}/junit-4.12.jar)
|
|
|
|
set(JAVA_HAMCR_JAR ${JAVA_TEST_LIBDIR}/hamcrest-core-1.3.jar)
|
|
|
|
set(JAVA_MOCKITO_JAR ${JAVA_TEST_LIBDIR}/mockito-all-1.10.19.jar)
|
|
|
|
set(JAVA_CGLIB_JAR ${JAVA_TEST_LIBDIR}/cglib-2.2.2.jar)
|
|
|
|
set(JAVA_ASSERTJ_JAR ${JAVA_TEST_LIBDIR}/assertj-core-1.7.1.jar)
|
|
|
|
set(JAVA_TESTCLASSPATH ${JAVA_JUNIT_JAR} ${JAVA_HAMCR_JAR} ${JAVA_MOCKITO_JAR} ${JAVA_CGLIB_JAR} ${JAVA_ASSERTJ_JAR})
|
|
|
|
|
|
|
|
set(JNI_OUTPUT_DIR ${PROJECT_SOURCE_DIR}/java/include)
|
|
|
|
file(MAKE_DIRECTORY ${JNI_OUTPUT_DIR})
|
|
|
|
|
|
|
|
if(${Java_VERSION_MINOR} VERSION_LESS_EQUAL "7" AND ${Java_VERSION_MAJOR} STREQUAL "1")
|
|
|
|
message(FATAL_ERROR "Detected Java 7 or older (${Java_VERSION_STRING}), minimum required version in now Java 8")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(${Java_VERSION_MAJOR} VERSION_GREATER_EQUAL "10" AND ${CMAKE_VERSION} VERSION_LESS "3.11.4")
|
|
|
|
# Java 10 and newer don't have javah, but the alternative GENERATE_NATIVE_HEADERS requires CMake 3.11.4 or newer
|
|
|
|
message(FATAL_ERROR "Detected Java 10 or newer (${Java_VERSION_STRING}), to build with CMake please upgrade CMake to 3.11.4 or newer")
|
|
|
|
|
|
|
|
elseif(${CMAKE_VERSION} VERSION_LESS "3.11.4")
|
|
|
|
# Old CMake
|
|
|
|
message("Using an old CMAKE (${CMAKE_VERSION}) - JNI headers generated in separate step")
|
|
|
|
add_jar(
|
|
|
|
rocksdbjni_classes
|
|
|
|
SOURCES
|
|
|
|
${JAVA_MAIN_CLASSES}
|
|
|
|
${JAVA_TEST_CLASSES}
|
|
|
|
INCLUDE_JARS ${JAVA_TESTCLASSPATH}
|
|
|
|
)
|
|
|
|
|
|
|
|
else ()
|
|
|
|
# Java 1.8 or newer prepare the JAR...
|
|
|
|
message("Preparing Jar for JDK ${Java_VERSION_STRING}")
|
|
|
|
add_jar(
|
|
|
|
rocksdbjni_classes
|
|
|
|
SOURCES
|
|
|
|
${JAVA_MAIN_CLASSES}
|
|
|
|
${JAVA_TEST_CLASSES}
|
|
|
|
INCLUDE_JARS ${JAVA_TESTCLASSPATH}
|
|
|
|
GENERATE_NATIVE_HEADERS rocksdbjni_headers DESTINATION ${JNI_OUTPUT_DIR}
|
|
|
|
)
|
|
|
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/java/classes)
|
|
|
|
file(MAKE_DIRECTORY ${PROJECT_SOURCE_DIR}/java/classes)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(NOT EXISTS ${JAVA_TEST_LIBDIR})
|
|
|
|
file(MAKE_DIRECTORY mkdir ${JAVA_TEST_LIBDIR})
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if (DEFINED CUSTOM_DEPS_URL)
|
|
|
|
set(DEPS_URL ${CUSTOM_DEPS_URL}/)
|
|
|
|
else ()
|
|
|
|
# Using a Facebook AWS account for S3 storage. (maven.org has a history
|
|
|
|
# of failing in Travis builds.)
|
|
|
|
set(DEPS_URL "https://rocksdb-deps.s3-us-west-2.amazonaws.com/jars")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(NOT EXISTS ${JAVA_JUNIT_JAR})
|
|
|
|
message("Downloading ${JAVA_JUNIT_JAR}")
|
|
|
|
file(DOWNLOAD ${DEPS_URL}/junit-4.12.jar ${JAVA_TMP_JAR} STATUS downloadStatus)
|
|
|
|
list(GET downloadStatus 0 error_code)
|
|
|
|
list(GET downloadStatus 1 error_message)
|
|
|
|
if(NOT error_code EQUAL 0)
|
|
|
|
message(FATAL_ERROR "Failed downloading ${JAVA_JUNIT_JAR}: ${error_message}")
|
|
|
|
endif()
|
|
|
|
file(RENAME ${JAVA_TMP_JAR} ${JAVA_JUNIT_JAR})
|
|
|
|
endif()
|
|
|
|
if(NOT EXISTS ${JAVA_HAMCR_JAR})
|
|
|
|
message("Downloading ${JAVA_HAMCR_JAR}")
|
|
|
|
file(DOWNLOAD ${DEPS_URL}/hamcrest-core-1.3.jar ${JAVA_TMP_JAR} STATUS downloadStatus)
|
|
|
|
list(GET downloadStatus 0 error_code)
|
|
|
|
list(GET downloadStatus 1 error_message)
|
|
|
|
if(NOT error_code EQUAL 0)
|
|
|
|
message(FATAL_ERROR "Failed downloading ${JAVA_HAMCR_JAR}: ${error_message}")
|
|
|
|
endif()
|
|
|
|
file(RENAME ${JAVA_TMP_JAR} ${JAVA_HAMCR_JAR})
|
|
|
|
endif()
|
|
|
|
if(NOT EXISTS ${JAVA_MOCKITO_JAR})
|
|
|
|
message("Downloading ${JAVA_MOCKITO_JAR}")
|
|
|
|
file(DOWNLOAD ${DEPS_URL}/mockito-all-1.10.19.jar ${JAVA_TMP_JAR} STATUS downloadStatus)
|
|
|
|
list(GET downloadStatus 0 error_code)
|
|
|
|
list(GET downloadStatus 1 error_message)
|
|
|
|
if(NOT error_code EQUAL 0)
|
|
|
|
message(FATAL_ERROR "Failed downloading ${JAVA_MOCKITO_JAR}: ${error_message}")
|
|
|
|
endif()
|
|
|
|
file(RENAME ${JAVA_TMP_JAR} ${JAVA_MOCKITO_JAR})
|
|
|
|
endif()
|
|
|
|
if(NOT EXISTS ${JAVA_CGLIB_JAR})
|
|
|
|
message("Downloading ${JAVA_CGLIB_JAR}")
|
|
|
|
file(DOWNLOAD ${DEPS_URL}/cglib-2.2.2.jar ${JAVA_TMP_JAR} STATUS downloadStatus)
|
|
|
|
list(GET downloadStatus 0 error_code)
|
|
|
|
list(GET downloadStatus 1 error_message)
|
|
|
|
if(NOT error_code EQUAL 0)
|
|
|
|
message(FATAL_ERROR "Failed downloading ${JAVA_CGLIB_JAR}: ${error_message}")
|
|
|
|
endif()
|
|
|
|
file(RENAME ${JAVA_TMP_JAR} ${JAVA_CGLIB_JAR})
|
|
|
|
endif()
|
|
|
|
if(NOT EXISTS ${JAVA_ASSERTJ_JAR})
|
|
|
|
message("Downloading ${JAVA_ASSERTJ_JAR}")
|
|
|
|
file(DOWNLOAD ${DEPS_URL}/assertj-core-1.7.1.jar ${JAVA_TMP_JAR} STATUS downloadStatus)
|
|
|
|
list(GET downloadStatus 0 error_code)
|
|
|
|
list(GET downloadStatus 1 error_message)
|
|
|
|
if(NOT error_code EQUAL 0)
|
|
|
|
message(FATAL_ERROR "Failed downloading ${JAVA_ASSERTJ_JAR}: ${error_message}")
|
|
|
|
endif()
|
|
|
|
file(RENAME ${JAVA_TMP_JAR} ${JAVA_ASSERTJ_JAR})
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(${CMAKE_VERSION} VERSION_LESS "3.11.4")
|
|
|
|
# Old CMake ONLY generate JNI headers, otherwise JNI is handled in add_jar step above
|
|
|
|
message("Preparing JNI headers for old CMake (${CMAKE_VERSION})")
|
|
|
|
set(NATIVE_JAVA_CLASSES
|
|
|
|
org.rocksdb.AbstractCompactionFilter
|
|
|
|
org.rocksdb.AbstractCompactionFilterFactory
|
|
|
|
org.rocksdb.AbstractComparator
|
|
|
|
org.rocksdb.AbstractEventListener
|
|
|
|
org.rocksdb.AbstractImmutableNativeReference
|
|
|
|
org.rocksdb.AbstractNativeReference
|
|
|
|
org.rocksdb.AbstractRocksIterator
|
|
|
|
org.rocksdb.AbstractSlice
|
|
|
|
org.rocksdb.AbstractTableFilter
|
|
|
|
org.rocksdb.AbstractTraceWriter
|
|
|
|
org.rocksdb.AbstractTransactionNotifier
|
|
|
|
org.rocksdb.AbstractWalFilter
|
|
|
|
org.rocksdb.BackupEngineOptions
|
|
|
|
org.rocksdb.BackupEngine
|
|
|
|
org.rocksdb.BlockBasedTableConfig
|
|
|
|
org.rocksdb.BloomFilter
|
|
|
|
org.rocksdb.CassandraCompactionFilter
|
|
|
|
org.rocksdb.CassandraValueMergeOperator
|
|
|
|
org.rocksdb.Checkpoint
|
|
|
|
org.rocksdb.ClockCache
|
|
|
|
org.rocksdb.Cache
|
|
|
|
org.rocksdb.ColumnFamilyHandle
|
|
|
|
org.rocksdb.ColumnFamilyOptions
|
|
|
|
org.rocksdb.CompactionJobInfo
|
|
|
|
org.rocksdb.CompactionJobStats
|
|
|
|
org.rocksdb.CompactionOptions
|
|
|
|
org.rocksdb.CompactionOptionsFIFO
|
|
|
|
org.rocksdb.CompactionOptionsUniversal
|
|
|
|
org.rocksdb.CompactRangeOptions
|
|
|
|
org.rocksdb.ComparatorOptions
|
|
|
|
org.rocksdb.CompressionOptions
|
|
|
|
org.rocksdb.ConcurrentTaskLimiterImpl
|
|
|
|
org.rocksdb.ConfigOptions
|
|
|
|
org.rocksdb.DBOptions
|
|
|
|
org.rocksdb.DirectSlice
|
|
|
|
org.rocksdb.Env
|
|
|
|
org.rocksdb.EnvOptions
|
|
|
|
org.rocksdb.Filter
|
|
|
|
org.rocksdb.FlushOptions
|
|
|
|
org.rocksdb.HashLinkedListMemTableConfig
|
|
|
|
org.rocksdb.HashSkipListMemTableConfig
|
|
|
|
org.rocksdb.IngestExternalFileOptions
|
|
|
|
org.rocksdb.Logger
|
|
|
|
org.rocksdb.LRUCache
|
|
|
|
org.rocksdb.MemoryUtil
|
|
|
|
org.rocksdb.MemTableConfig
|
|
|
|
org.rocksdb.NativeComparatorWrapper
|
|
|
|
org.rocksdb.NativeLibraryLoader
|
|
|
|
org.rocksdb.OptimisticTransactionDB
|
|
|
|
org.rocksdb.OptimisticTransactionOptions
|
|
|
|
org.rocksdb.Options
|
|
|
|
org.rocksdb.OptionsUtil
|
|
|
|
org.rocksdb.PersistentCache
|
|
|
|
org.rocksdb.PlainTableConfig
|
|
|
|
org.rocksdb.RateLimiter
|
|
|
|
org.rocksdb.ReadOptions
|
|
|
|
org.rocksdb.RemoveEmptyValueCompactionFilter
|
|
|
|
org.rocksdb.RestoreOptions
|
|
|
|
org.rocksdb.RocksCallbackObject
|
|
|
|
org.rocksdb.RocksDB
|
|
|
|
org.rocksdb.RocksEnv
|
|
|
|
org.rocksdb.RocksIterator
|
|
|
|
org.rocksdb.RocksIteratorInterface
|
|
|
|
org.rocksdb.RocksMemEnv
|
|
|
|
org.rocksdb.RocksMutableObject
|
|
|
|
org.rocksdb.RocksObject
|
|
|
|
org.rocksdb.SkipListMemTableConfig
|
|
|
|
org.rocksdb.Slice
|
|
|
|
org.rocksdb.Snapshot
|
|
|
|
org.rocksdb.SstFileManager
|
|
|
|
org.rocksdb.SstFileWriter
|
|
|
|
org.rocksdb.SstFileReader
|
|
|
|
org.rocksdb.SstFileReaderIterator
|
|
|
|
org.rocksdb.SstPartitionerFactory
|
|
|
|
org.rocksdb.SstPartitionerFixedPrefixFactory
|
|
|
|
org.rocksdb.Statistics
|
|
|
|
org.rocksdb.StringAppendOperator
|
|
|
|
org.rocksdb.TableFormatConfig
|
|
|
|
org.rocksdb.ThreadStatus
|
|
|
|
org.rocksdb.TimedEnv
|
|
|
|
org.rocksdb.Transaction
|
|
|
|
org.rocksdb.TransactionDB
|
|
|
|
org.rocksdb.TransactionDBOptions
|
|
|
|
org.rocksdb.TransactionLogIterator
|
|
|
|
org.rocksdb.TransactionOptions
|
|
|
|
org.rocksdb.TtlDB
|
|
|
|
org.rocksdb.UInt64AddOperator
|
|
|
|
org.rocksdb.VectorMemTableConfig
|
|
|
|
org.rocksdb.WBWIRocksIterator
|
|
|
|
org.rocksdb.WriteBatch
|
|
|
|
org.rocksdb.WriteBatch.Handler
|
|
|
|
org.rocksdb.WriteBatchInterface
|
|
|
|
org.rocksdb.WriteBatchWithIndex
|
|
|
|
org.rocksdb.WriteOptions
|
|
|
|
org.rocksdb.NativeComparatorWrapperTest
|
|
|
|
org.rocksdb.RocksDBExceptionTest
|
|
|
|
org.rocksdb.SnapshotTest
|
|
|
|
org.rocksdb.WriteBatchTest
|
|
|
|
org.rocksdb.WriteBatchTestInternalHelper
|
|
|
|
org.rocksdb.WriteBufferManager
|
|
|
|
org.rocksdb.test.TestableEventListener
|
|
|
|
)
|
|
|
|
|
|
|
|
create_javah(
|
|
|
|
TARGET rocksdbjni_headers
|
|
|
|
CLASSES ${NATIVE_JAVA_CLASSES}
|
|
|
|
CLASSPATH rocksdbjni_classes ${JAVA_TESTCLASSPATH}
|
|
|
|
OUTPUT_DIR ${JNI_OUTPUT_DIR}
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(NOT MSVC)
|
|
|
|
set_property(TARGET ${ROCKSDB_STATIC_LIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set(ROCKSDBJNI_STATIC_LIB rocksdbjni${ARTIFACT_SUFFIX})
|
|
|
|
add_library(${ROCKSDBJNI_STATIC_LIB} ${JNI_NATIVE_SOURCES})
|
|
|
|
add_dependencies(${ROCKSDBJNI_STATIC_LIB} rocksdbjni_headers)
|
|
|
|
target_link_libraries(${ROCKSDBJNI_STATIC_LIB} ${ROCKSDB_STATIC_LIB} ${ROCKSDB_LIB})
|
|
|
|
|
|
|
|
if(NOT MINGW)
|
|
|
|
set(ROCKSDBJNI_SHARED_LIB rocksdbjni-shared${ARTIFACT_SUFFIX})
|
|
|
|
add_library(${ROCKSDBJNI_SHARED_LIB} SHARED ${JNI_NATIVE_SOURCES})
|
|
|
|
add_dependencies(${ROCKSDBJNI_SHARED_LIB} rocksdbjni_headers)
|
|
|
|
target_link_libraries(${ROCKSDBJNI_SHARED_LIB} ${ROCKSDB_STATIC_LIB} ${ROCKSDB_LIB})
|
|
|
|
|
|
|
|
set_target_properties(
|
|
|
|
${ROCKSDBJNI_SHARED_LIB}
|
|
|
|
PROPERTIES
|
|
|
|
COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_CFG_INTDIR}
|
|
|
|
COMPILE_PDB_NAME ${ROCKSDBJNI_STATIC_LIB}.pdb
|
|
|
|
)
|
|
|
|
endif()
|