RocksDB support updates:

* Update unity build for RocksDB changes
* Log RocksDB options on startup
* Support RocksDB option strings
* Support full file bloom filters

You can now configure most RocksDB options with RocksDB's option
string scheme.

Set "filter_full" to 1 to make bloom filters for an
entire file rather than each block. More memory will be
needed during compaction but less memory will be needed
during fetching for large databases. Does nothing unless
bloom filters are enabled with "filter_bits".

Example:
options = max_compaction_bytes=64;max_bytes_for_level_multiplier=64
clock_cache_mb = 96
filter_bits = 10
filter_full = 1

Builds/VisualStudio2015/RippleD.vcxproj

@@ -3349,6 +3349,16 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\cache\lru_cache.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\cache\lru_cache.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\cache\sharded_cache.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\cache\sharded_cache.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\builder.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3362,16 +3372,41 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\column_family.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\compacted_db_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\compacted_db_impl.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\compaction.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\compaction.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\db\compaction_iteration_stats.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\compaction_iterator.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\compaction_iterator.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\compaction_job.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\compaction_job.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\compaction_picker.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\compaction_picker.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\compaction_picker_universal.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\compaction_picker_universal.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\convenience.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\db\dbformat.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3385,29 +3420,64 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\db_impl.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\db_impl_compaction_flush.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\db\db_impl_debug.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\db\db_impl_experimental.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\db\db_impl_files.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\db\db_impl_open.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\db\db_impl_readonly.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\db_impl_readonly.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\db_impl_write.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\db\db_info_dumper.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\db_info_dumper.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\db_iter.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\db_iter.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\db\filename.cc">
+    <ClCompile Include="..\..\src\rocksdb2\db\event_helpers.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\db\filename.h">
+    <ClInclude Include="..\..\src\rocksdb2\db\event_helpers.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\external_sst_file_ingestion_job.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\external_sst_file_ingestion_job.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\file_indexer.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\file_indexer.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\flush_job.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\flush_job.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\flush_scheduler.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\flush_scheduler.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\forward_iterator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3418,6 +3488,8 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\internal_stats.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\db\job_context.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\db\log_format.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\log_reader.cc">
@@ -3430,6 +3502,16 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\log_writer.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\malloc_stats.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\malloc_stats.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\managed_iterator.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\managed_iterator.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\memtable.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3450,12 +3532,17 @@
     <ClCompile Include="..\..\src\rocksdb2\db\merge_operator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\pinned_iterators_manager.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\range_del_aggregator.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\range_del_aggregator.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\repair.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\db\skiplist.h">
+    <ClInclude Include="..\..\src\rocksdb2\db\snapshot_impl.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\db\snapshot.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\table_cache.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -3472,6 +3559,11 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\transaction_log_impl.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\version_builder.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\version_builder.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\version_edit.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3482,21 +3574,70 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\version_set.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\wal_manager.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\wal_manager.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\db\write_batch.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\db\write_batch_base.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\db\write_batch_internal.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\db\write_callback.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\write_controller.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\write_controller.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\db\write_thread.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\db\write_thread.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\env\env.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\env\env_hdfs.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\env\env_posix.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\env\io_posix.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\env\io_posix.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\env\mock_env.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\env\mock_env.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\env\posix_logger.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\hdfs\env_hdfs.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\advanced_options.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\c.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\cache.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\cleanable.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\compaction_filter.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\compaction_job_stats.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\comparator.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\convenience.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\db.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\env.h">
@@ -3509,22 +3650,36 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\iterator.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\ldb_tool.h">
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\listener.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\memtablerep.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\merge_operator.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\metadata.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\options.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\perf_context.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\perf_level.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\persistent_cache.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\rate_limiter.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\slice.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\slice_transform.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\snapshot.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\sst_dump_tool.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\sst_file_manager.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\sst_file_writer.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\statistics.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\status.h">
@@ -3533,6 +3688,10 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\table_properties.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\threadpool.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\thread_status.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\transaction_log.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\types.h">
@@ -3541,6 +3700,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\backupable_db.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\checkpoint.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\db_ttl.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\document_db.h">
@@ -3549,17 +3710,136 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\json_document.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\optimistic_transaction_db.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\spatial_db.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\stackable_db.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\transaction.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\transaction_db.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\transaction_db_mutex.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\utility_db.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\utilities\write_batch_with_index.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\version.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\wal_filter.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\write_batch.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\port\atomic_pointer.h">
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\write_batch_base.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\include\rocksdb\write_buffer_manager.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\alloc_tracker.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\hash_cuckoo_rep.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\memtable\hash_cuckoo_rep.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\hash_linklist_rep.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\memtable\hash_linklist_rep.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\hash_skiplist_rep.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\memtable\hash_skiplist_rep.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\memtable\inlineskiplist.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\memtable\skiplist.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\skiplistrep.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\memtable\stl_wrappers.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\vectorrep.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\memtable\write_buffer_manager.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\file_read_sample.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\histogram.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\histogram.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\instrumented_mutex.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\instrumented_mutex.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\iostats_context.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\iostats_context_imp.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\perf_context.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\perf_context_imp.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\perf_level.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\perf_level_imp.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\perf_step_timer.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\statistics.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\statistics.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\thread_status_updater.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\thread_status_updater.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\monitoring\thread_status_util.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\monitoring\thread_status_util.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\options\cf_options.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\options\cf_options.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\options\db_options.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\options\db_options.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\options\options.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\options\options_helper.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\options\options_helper.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\options\options_parser.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\options\options_parser.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\options\options_sanity_check.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\options\options_sanity_check.h">
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\port\likely.h">
     </ClInclude>
@@ -3575,6 +3855,20 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\port\stack_trace.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\sys_time.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\util_logger.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\win\port_win.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\win\win_logger.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\win\win_thread.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\win\xpress_win.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\port\xpress.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\adaptive_table_factory.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3585,6 +3879,11 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\block.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\block_based_filter_block.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\block_based_filter_block.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\block_based_table_builder.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3605,11 +3904,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\block_builder.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\table\block_hash_index.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\table\block_hash_index.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\block_prefix_index.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3635,9 +3929,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\cuckoo_table_reader.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\table\filter_block.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\filter_block.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\flush_block_policy.cc">
@@ -3648,6 +3939,25 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\format.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\table\full_filter_bits_builder.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\full_filter_block.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\full_filter_block.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\get_context.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\get_context.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\index_builder.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\index_builder.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\table\internal_iterator.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\iterator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3655,16 +3965,28 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\table\iter_heap.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\table\merger.cc">
+    <ClCompile Include="..\..\src\rocksdb2\table\merging_iterator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\table\merger.h">
+    <ClInclude Include="..\..\src\rocksdb2\table\merging_iterator.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\meta_blocks.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\meta_blocks.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\partitioned_filter_block.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\partitioned_filter_block.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\persistent_cache_helper.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\persistent_cache_helper.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\table\persistent_cache_options.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\plain_table_builder.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3690,11 +4012,20 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\plain_table_reader.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\table\scoped_arena_iterator.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\table\sst_file_writer.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\sst_file_writer_collectors.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\table\table_builder.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\table_properties.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\table\table_properties_internal.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\table\table_reader.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\table\two_level_iterator.cc">
@@ -3702,23 +4033,35 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\table\two_level_iterator.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\third-party\rapidjson\internal\pow10.h">
+    <ClInclude Include="..\..\src\rocksdb2\third-party\fbson\FbsonDocument.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\third-party\rapidjson\internal\stack.h">
+    <ClInclude Include="..\..\src\rocksdb2\third-party\fbson\FbsonJsonParser.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\third-party\rapidjson\rapidjson.h">
+    <ClInclude Include="..\..\src\rocksdb2\third-party\fbson\FbsonStream.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\third-party\rapidjson\reader.h">
+    <ClInclude Include="..\..\src\rocksdb2\third-party\fbson\FbsonUtil.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\third-party\fbson\FbsonWriter.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\tools\sst_dump_tool_imp.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\checkpoint\checkpoint_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\checkpoint\checkpoint_impl.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\utilities\document\json_document.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\document\json_document_builder.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3756,11 +4099,68 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\utilities\spatialdb\utils.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\optimistic_transaction.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\optimistic_transaction.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\optimistic_transaction_db_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\optimistic_transaction_db_impl.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\pessimistic_transaction.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\pessimistic_transaction.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\pessimistic_transaction_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\pessimistic_transaction_db.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\transaction_base.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\transaction_base.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\transaction_db_mutex_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\transaction_db_mutex_impl.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\transaction_lock_mgr.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\transaction_lock_mgr.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\transaction_util.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\transaction_util.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\transactions\write_prepared_txn.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\transactions\write_prepared_txn.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\write_batch_with_index\write_batch_with_index.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\write_batch_with_index\write_batch_with_index_internal.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\write_batch_with_index\write_batch_with_index_internal.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\util\aligned_buffer.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\util\allocator.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\arena.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3773,49 +4173,70 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\auto_roll_logger.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\blob_store.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\blob_store.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\bloom.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\build_version.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\cache.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\cast_util.h">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClInclude>
-    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\channel.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\coding.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\coding.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\util\compaction_job_stats_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\util\comparator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\compression.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\util\concurrent_arena.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\concurrent_arena.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\util\core_local.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\crc32c.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\crc32c.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\db_info_dummper.cc">
+    <ClCompile Include="..\..\src\rocksdb2\util\delete_scheduler.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\delete_scheduler.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\dynamic_bloom.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\dynamic_bloom.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\env.cc">
+    <ClCompile Include="..\..\src\rocksdb2\util\event_logger.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\util\env_hdfs.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\event_logger.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\util\filename.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\util\env_posix.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\filename.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\util\file_reader_writer.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\file_reader_writer.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\util\file_util.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\file_util.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\filter_policy.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3824,44 +4245,12 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\hash.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\hash_cuckoo_rep.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\hash_map.h">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\hash_cuckoo_rep.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\hash_linklist_rep.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\heap.h">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\hash_linklist_rep.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\hash_skiplist_rep.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\kv_map.h">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\hash_skiplist_rep.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\histogram.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\histogram.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\iostats_context.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\iostats_context_imp.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\ldb_cmd.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\ldb_cmd.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\util\ldb_cmd_execute_result.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\ldb_tool.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\util\logging.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\logging.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\log_buffer.cc">
@@ -3869,6 +4258,8 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\log_buffer.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\util\memory_usage.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\murmurhash.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3876,19 +4267,9 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\util\mutexlock.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\options.cc">
+    <ClCompile Include="..\..\src\rocksdb2\util\random.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\util\options_builder.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\util\perf_context.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\perf_context_imp.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\util\posix_logger.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\util\random.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\rate_limiter.cc">
@@ -3896,22 +4277,20 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\rate_limiter.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\skiplistrep.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\util\slice.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\util\statistics.cc">
+    <ClCompile Include="..\..\src\rocksdb2\util\sst_file_manager_impl.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\statistics.h">
+    <ClInclude Include="..\..\src\rocksdb2\util\sst_file_manager_impl.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\status.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\util\stl_wrappers.h">
+    <ClCompile Include="..\..\src\rocksdb2\util\status_message.cc">
-    </ClInclude>
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\stop_watch.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\string_util.cc">
@@ -3924,14 +4303,18 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\sync_point.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\util\threadpool_imp.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\util\threadpool_imp.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\thread_local.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\thread_local.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\util\vectorrep.cc">
+    <ClInclude Include="..\..\src\rocksdb2\util\thread_operation.h">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClInclude>
-    </ClCompile>
     <ClCompile Include="..\..\src\rocksdb2\util\xxhash.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>

src/ripple/nodestore/backend/RocksDBFactory.cpp

@@ -118,10 +118,15 @@ public:
         options.env = env;
 
         if (keyValues.exists ("cache_mb"))
-            table_options.block_cache = rocksdb::NewLRUCache (get<int>(keyValues, "cache_mb") * 1024L * 1024L);
+            table_options.block_cache = rocksdb::NewLRUCache (
+                get<int>(keyValues, "cache_mb") * 1024L * 1024L);
 
         if (auto const v = get<int>(keyValues, "filter_bits"))
-            table_options.filter_policy.reset (rocksdb::NewBloomFilterPolicy (v));
+        {
+            bool const filter_blocks = !keyValues.exists ("filter_full") ||
+                (get<int>(keyValues, "filter_full") == 0);
+            table_options.filter_policy.reset (rocksdb::NewBloomFilterPolicy (v, filter_blocks));
+        }
 
         if (get_if_exists (keyValues, "open_files", options.max_open_files))
             fdlimit_ = options.max_open_files;
@@ -169,8 +174,28 @@ public:
             options.write_buffer_size = 6 * options.target_file_size_base;
         }
 
+        if (keyValues.exists("bbt_options"))
+        {
+            auto const s = rocksdb::GetBlockBasedTableOptionsFromString(
+                table_options,
+                get<std::string>(keyValues, "bbt_options"),
+                &table_options);
+            if (! s.ok())
+                Throw<std::runtime_error> (
+                    std::string("Unable to set RocksDB bbt_options: ") + s.ToString());
+        }
+
         options.table_factory.reset(NewBlockBasedTableFactory(table_options));
 
+        if (keyValues.exists("options"))
+        {
+            auto const s = rocksdb::GetOptionsFromString(
+                options, get<std::string>(keyValues, "options"), &options);
+            if (! s.ok())
+                Throw<std::runtime_error> (
+                    std::string("Unable to set RocksDB options: ") + s.ToString());
+        }
+
         rocksdb::DB* db = nullptr;
         rocksdb::Status status = rocksdb::DB::Open (options, m_name, &db);
         if (! status.ok () || ! db)
@@ -178,6 +203,12 @@ public:
                 std::string("Unable to open/create RocksDB: ") + status.ToString());
 
         m_db.reset (db);
+
+        std::string s1, s2;
+        rocksdb::GetStringFromDBOptions(&s1, options, "; ");
+        rocksdb::GetStringFromColumnFamilyOptions(&s2, options, "; ");
+        JLOG(m_journal.debug()) << "RocksDB DBOptions: " << s1;
+        JLOG(m_journal.debug()) << "RocksDB CFOptions: " << s2;
     }
 
     ~RocksDBBackend ()

src/ripple/unity/rocksdb.cpp

@@ -48,110 +48,169 @@
 #define NDEBUG
 #endif
 
+#include <rocksdb2/cache/lru_cache.cc>
+#include <rocksdb2/cache/sharded_cache.cc>
 #include <rocksdb2/db/builder.cc>
 #include <rocksdb2/db/c.cc>
 #include <rocksdb2/db/column_family.cc>
+#include <rocksdb2/db/compacted_db_impl.cc>
 #include <rocksdb2/db/compaction.cc>
+#include <rocksdb2/db/compaction_iterator.cc>
+#include <rocksdb2/db/compaction_job.cc>
 #include <rocksdb2/db/compaction_picker.cc>
+#include <rocksdb2/db/compaction_picker_universal.cc>
+#include <rocksdb2/db/convenience.cc>
 #include <rocksdb2/db/db_filesnapshot.cc>
-#include <rocksdb2/db/dbformat.cc>
 #include <rocksdb2/db/db_impl.cc>
+#include <rocksdb2/db/db_impl_compaction_flush.cc>
 #include <rocksdb2/db/db_impl_debug.cc>
+#include <rocksdb2/db/db_impl_experimental.cc>
+#include <rocksdb2/db/db_impl_files.cc>
+#include <rocksdb2/db/db_impl_open.cc>
 #include <rocksdb2/db/db_impl_readonly.cc>
+#include <rocksdb2/db/db_impl_write.cc>
+#include <rocksdb2/db/db_info_dumper.cc>
 #include <rocksdb2/db/db_iter.cc>
+#include <rocksdb2/db/dbformat.cc>
+#include <rocksdb2/db/event_helpers.cc>
+#include <rocksdb2/db/external_sst_file_ingestion_job.cc>
 #include <rocksdb2/db/file_indexer.cc>
-#include <rocksdb2/db/filename.cc>
+#include <rocksdb2/db/flush_job.cc>
+#include <rocksdb2/db/flush_scheduler.cc>
 #include <rocksdb2/db/forward_iterator.cc>
 #include <rocksdb2/db/internal_stats.cc>
 #include <rocksdb2/db/log_reader.cc>
 #include <rocksdb2/db/log_writer.cc>
+#include <rocksdb2/db/malloc_stats.cc>
+#include <rocksdb2/db/managed_iterator.cc>
 #include <rocksdb2/db/memtable.cc>
 #include <rocksdb2/db/memtable_list.cc>
 #include <rocksdb2/db/merge_helper.cc>
 #include <rocksdb2/db/merge_operator.cc>
+#include <rocksdb2/db/range_del_aggregator.cc>
 #include <rocksdb2/db/repair.cc>
 #include <rocksdb2/db/table_cache.cc>
 #include <rocksdb2/db/table_properties_collector.cc>
 #include <rocksdb2/db/transaction_log_impl.cc>
+#include <rocksdb2/db/version_builder.cc>
 #include <rocksdb2/db/version_edit.cc>
 #include <rocksdb2/db/version_set.cc>
+#include <rocksdb2/db/wal_manager.cc>
 #include <rocksdb2/db/write_batch.cc>
+#include <rocksdb2/db/write_batch_base.cc>
+#include <rocksdb2/db/write_controller.cc>
+#include <rocksdb2/db/write_thread.cc>
+#include <rocksdb2/env/env.cc>
+#include <rocksdb2/env/env_hdfs.cc>
+#include <rocksdb2/env/env_posix.cc>
+#include <rocksdb2/env/io_posix.cc>
+#include <rocksdb2/env/mock_env.cc>
+#include <rocksdb2/memtable/alloc_tracker.cc>
+#include <rocksdb2/memtable/hash_cuckoo_rep.cc>
+#include <rocksdb2/memtable/hash_linklist_rep.cc>
+#include <rocksdb2/memtable/hash_skiplist_rep.cc>
+#include <rocksdb2/memtable/skiplistrep.cc>
+#include <rocksdb2/memtable/vectorrep.cc>
+#include <rocksdb2/memtable/write_buffer_manager.cc>
+#include <rocksdb2/monitoring/histogram.cc>
+#include <rocksdb2/monitoring/instrumented_mutex.cc>
+#include <rocksdb2/monitoring/iostats_context.cc>
+#include <rocksdb2/monitoring/perf_context.cc>
+#include <rocksdb2/monitoring/perf_level.cc>
+#include <rocksdb2/monitoring/statistics.cc>
+#include <rocksdb2/monitoring/thread_status_updater.cc>
+#include <rocksdb2/monitoring/thread_status_util.cc>
+#include <rocksdb2/options/cf_options.cc>
+#include <rocksdb2/options/db_options.cc>
+#include <rocksdb2/options/options.cc>
+#include <rocksdb2/options/options_helper.cc>
+#include <rocksdb2/options/options_parser.cc>
+#include <rocksdb2/options/options_sanity_check.cc>
+#include <rocksdb2/port/port_posix.cc>
+#include <rocksdb2/port/stack_trace.cc>
 #include <rocksdb2/table/adaptive_table_factory.cc>
+#include <rocksdb2/table/block.cc>
+#include <rocksdb2/table/block_based_filter_block.cc>
 #include <rocksdb2/table/block_based_table_builder.cc>
 #include <rocksdb2/table/block_based_table_factory.cc>
 #include <rocksdb2/table/block_based_table_reader.cc>
 #include <rocksdb2/table/block_builder.cc>
-#include <rocksdb2/table/block.cc>
-#include <rocksdb2/table/block_hash_index.cc>
 #include <rocksdb2/table/block_prefix_index.cc>
 #include <rocksdb2/table/bloom_block.cc>
 #include <rocksdb2/table/cuckoo_table_builder.cc>
 #include <rocksdb2/table/cuckoo_table_factory.cc>
 #include <rocksdb2/table/cuckoo_table_reader.cc>
-#include <rocksdb2/table/filter_block.cc>
 #include <rocksdb2/table/flush_block_policy.cc>
 #include <rocksdb2/table/format.cc>
+#include <rocksdb2/table/full_filter_block.cc>
+#include <rocksdb2/table/get_context.cc>
+#include <rocksdb2/table/index_builder.cc>
 #include <rocksdb2/table/iterator.cc>
-#include <rocksdb2/table/merger.cc>
+#include <rocksdb2/table/merging_iterator.cc>
 #include <rocksdb2/table/meta_blocks.cc>
+#include <rocksdb2/table/partitioned_filter_block.cc>
+#include <rocksdb2/table/persistent_cache_helper.cc>
 #include <rocksdb2/table/plain_table_builder.cc>
 #include <rocksdb2/table/plain_table_factory.cc>
 #include <rocksdb2/table/plain_table_index.cc>
 #include <rocksdb2/table/plain_table_key_coding.cc>
 #include <rocksdb2/table/plain_table_reader.cc>
+#include <rocksdb2/table/sst_file_writer.cc>
 #include <rocksdb2/table/table_properties.cc>
 #include <rocksdb2/table/two_level_iterator.cc>
 #include <rocksdb2/util/arena.cc>
 #include <rocksdb2/util/auto_roll_logger.cc>
-#include <rocksdb2/util/blob_store.cc>
 #include <rocksdb2/util/bloom.cc>
-#include <rocksdb2/util/cache.cc>
 #include <rocksdb2/util/coding.cc>
+#include <rocksdb2/util/compaction_job_stats_impl.cc>
 #include <rocksdb2/util/comparator.cc>
+#include <rocksdb2/util/concurrent_arena.cc>
 #include <rocksdb2/util/crc32c.cc>
-#include <rocksdb2/util/db_info_dummper.cc>
+#include <rocksdb2/util/delete_scheduler.cc>
 #include <rocksdb2/util/dynamic_bloom.cc>
-#include <rocksdb2/util/env.cc>
+#include <rocksdb2/util/event_logger.cc>
-#include <rocksdb2/util/env_hdfs.cc>
+#include <rocksdb2/util/file_reader_writer.cc>
-#include <rocksdb2/util/env_posix.cc>
+#include <rocksdb2/util/file_util.cc>
+#include <rocksdb2/util/filename.cc>
 #include <rocksdb2/util/filter_policy.cc>
 #include <rocksdb2/util/hash.cc>
-#include <rocksdb2/util/hash_cuckoo_rep.cc>
-#include <rocksdb2/util/hash_linklist_rep.cc>
-#include <rocksdb2/util/hash_skiplist_rep.cc>
-#include <rocksdb2/util/histogram.cc>
-#include <rocksdb2/util/iostats_context.cc>
-#include <rocksdb2/utilities/backupable/backupable_db.cc>
-#include <rocksdb2/utilities/document/document_db.cc>
-#include <rocksdb2/utilities/document/json_document.cc>
-#include <rocksdb2/utilities/geodb/geodb_impl.cc>
-#include <rocksdb2/utilities/merge_operators/put.cc>
-#include <rocksdb2/utilities/merge_operators/string_append/stringappend2.cc>
-#include <rocksdb2/utilities/merge_operators/string_append/stringappend.cc>
-#include <rocksdb2/utilities/merge_operators/uint64add.cc>
-#include <rocksdb2/utilities/redis/redis_lists.cc>
-#include <rocksdb2/utilities/spatialdb/spatial_db.cc>
-#include <rocksdb2/utilities/ttl/db_ttl_impl.cc>
-#include <rocksdb2/util/ldb_cmd.cc>
-#include <rocksdb2/util/ldb_tool.cc>
 #include <rocksdb2/util/log_buffer.cc>
-#include <rocksdb2/util/logging.cc>
 #include <rocksdb2/util/murmurhash.cc>
-#include <rocksdb2/util/options_builder.cc>
+#include <rocksdb2/util/random.cc>
-#include <rocksdb2/util/options.cc>
-#include <rocksdb2/util/perf_context.cc>
 #include <rocksdb2/util/rate_limiter.cc>
-#include <rocksdb2/util/skiplistrep.cc>
 #include <rocksdb2/util/slice.cc>
-#include <rocksdb2/util/statistics.cc>
+#include <rocksdb2/util/sst_file_manager_impl.cc>
 #include <rocksdb2/util/status.cc>
+#include <rocksdb2/util/status_message.cc>
 #include <rocksdb2/util/string_util.cc>
 #include <rocksdb2/util/sync_point.cc>
 #include <rocksdb2/util/thread_local.cc>
-#include <rocksdb2/util/vectorrep.cc>
+#include <rocksdb2/util/threadpool_imp.cc>
 #include <rocksdb2/util/xxhash.cc>
-#include <rocksdb2/port/stack_trace.cc>
+#include <rocksdb2/utilities/backupable/backupable_db.cc>
-#include <rocksdb2/port/port_posix.cc>
+#include <rocksdb2/utilities/checkpoint/checkpoint_impl.cc>
+#include <rocksdb2/utilities/document/document_db.cc>
+#include <rocksdb2/utilities/document/json_document.cc>
+#include <rocksdb2/utilities/document/json_document_builder.cc>
+#include <rocksdb2/utilities/geodb/geodb_impl.cc>
+#include <rocksdb2/utilities/merge_operators/put.cc>
+#include <rocksdb2/utilities/merge_operators/string_append/stringappend.cc>
+#include <rocksdb2/utilities/merge_operators/string_append/stringappend2.cc>
+#include <rocksdb2/utilities/merge_operators/uint64add.cc>
+#include <rocksdb2/utilities/redis/redis_lists.cc>
+#include <rocksdb2/utilities/spatialdb/spatial_db.cc>
+#include <rocksdb2/utilities/transactions/optimistic_transaction.cc>
+#include <rocksdb2/utilities/transactions/optimistic_transaction_db_impl.cc>
+#include <rocksdb2/utilities/transactions/pessimistic_transaction.cc>
+#include <rocksdb2/utilities/transactions/pessimistic_transaction_db.cc>
+#include <rocksdb2/utilities/transactions/transaction_base.cc>
+#include <rocksdb2/utilities/transactions/transaction_db_mutex_impl.cc>
+#include <rocksdb2/utilities/transactions/transaction_lock_mgr.cc>
+#include <rocksdb2/utilities/transactions/transaction_util.cc>
+#include <rocksdb2/utilities/transactions/write_prepared_txn.cc>
+#include <rocksdb2/utilities/ttl/db_ttl_impl.cc>
+#include <rocksdb2/utilities/write_batch_with_index/write_batch_with_index.cc>
+#include <rocksdb2/utilities/write_batch_with_index/write_batch_with_index_internal.cc>
 
 const char* rocksdb_build_git_sha = "<none>";
 const char* rocksdb_build_git_datetime = "<none>";

src/ripple/unity/rocksdb.h

@@ -35,6 +35,7 @@
 # define ROCKSDB_PLATFORM_WINDOWS
 #else
 # define ROCKSDB_PLATFORM_POSIX
+# define ROCKSDB_LIB_IO_POSIX
 # if BEAST_MAC || BEAST_IOS
 #  define OS_MACOSX 1
 # elif BEAST_BSD
@@ -60,6 +61,7 @@
 #include <rocksdb2/include/rocksdb/cache.h>
 #include <rocksdb2/include/rocksdb/compaction_filter.h>
 #include <rocksdb2/include/rocksdb/comparator.h>
+#include <rocksdb2/include/rocksdb/convenience.h>
 #include <rocksdb2/include/rocksdb/db.h>
 #include <rocksdb2/include/rocksdb/env.h>
 #include <rocksdb2/include/rocksdb/filter_policy.h>