Update rocksdb

Author: Torrie Fischer

src/ripple/nodestore/backend/RocksDBFactory.cpp

@@ -85,7 +85,6 @@ class RocksDBBackend
     Scheduler& m_scheduler;
     BatchWriter m_batch;
     std::string m_name;
-    std::unique_ptr <rocksdb::FilterPolicy const> m_filter_policy;
     std::unique_ptr <rocksdb::DB> m_db;
 
     RocksDBBackend (int keyBytes, Parameters const& keyValues,
@@ -100,28 +99,28 @@ class RocksDBBackend
             throw std::runtime_error ("Missing path in RocksDBFactory backend");
 
         rocksdb::Options options;
+        rocksdb::BlockBasedTableOptions table_options;
         options.create_if_missing = true;
         options.env = env;
 
         if (keyValues["cache_mb"].isEmpty())
         {
-            options.block_cache = rocksdb::NewLRUCache (getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024);
+            table_options.block_cache = rocksdb::NewLRUCache (getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024);
         }
         else
         {
-            options.block_cache = rocksdb::NewLRUCache (keyValues["cache_mb"].getIntValue() * 1024L * 1024L);
+            table_options.block_cache = rocksdb::NewLRUCache (keyValues["cache_mb"].getIntValue() * 1024L * 1024L);
         }
 
         if (keyValues["filter_bits"].isEmpty())
         {
             if (getConfig ().NODE_SIZE >= 2)
-                m_filter_policy.reset (rocksdb::NewBloomFilterPolicy (10));
+                table_options.filter_policy.reset (rocksdb::NewBloomFilterPolicy (10));
         }
         else if (keyValues["filter_bits"].getIntValue() != 0)
         {
-            m_filter_policy.reset (rocksdb::NewBloomFilterPolicy (keyValues["filter_bits"].getIntValue()));
+            table_options.filter_policy.reset (rocksdb::NewBloomFilterPolicy (keyValues["filter_bits"].getIntValue()));
         }
-        options.filter_policy = m_filter_policy.get();
 
         if (! keyValues["open_files"].isEmpty())
         {
@@ -167,7 +166,7 @@ class RocksDBBackend
 
         if (! keyValues["block_size"].isEmpty ())
         {
-            options.block_size = keyValues["block_size"].getIntValue ();
+            table_options.block_size = keyValues["block_size"].getIntValue ();
         }
 
         if (! keyValues["universal_compaction"].isEmpty ())
@@ -181,6 +180,8 @@ class RocksDBBackend
             }
         }
 
+        options.table_factory.reset(NewBlockBasedTableFactory(table_options));
+
         rocksdb::DB* db = nullptr;
         rocksdb::Status status = rocksdb::DB::Open (options, m_name, &db);
         if (!status.ok () || !db)
@@ -344,12 +345,12 @@ class RocksDBFactory : public Factory
 
     RocksDBFactory ()
     {
-        rocksdb::Options options;
-        options.create_if_missing = true;
-        options.block_cache = rocksdb::NewLRUCache (
+        rocksdb::BlockBasedTableOptions table_options;
+
+        table_options.block_cache = rocksdb::NewLRUCache (
             getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024);
 
-        m_lruCache = options.block_cache;
+        m_lruCache = table_options.block_cache;
     }
 
     ~RocksDBFactory ()

src/ripple/unity/rocksdb.cpp

@@ -61,6 +61,7 @@
 #include <rocksdb2/db/db_iter.cc>
 #include <rocksdb2/db/file_indexer.cc>
 #include <rocksdb2/db/filename.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>
@@ -72,12 +73,14 @@
 #include <rocksdb2/db/repair.cc>
 #include <rocksdb2/db/table_cache.cc>
 #include <rocksdb2/db/table_properties_collector.cc>
-#include <rocksdb2/db/tailing_iter.cc>
 #include <rocksdb2/db/transaction_log_impl.cc>
 #include <rocksdb2/db/version_edit.cc>
 #include <rocksdb2/db/version_set.cc>
 #include <rocksdb2/db/write_batch.cc>
+#include <rocksdb2/db/write_controller.cc>
+#include <rocksdb2/db/write_thread.cc>
 #include <rocksdb2/table/adaptive_table_factory.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>
@@ -87,10 +90,12 @@
 #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/iterator.cc>
 #include <rocksdb2/table/merger.cc>
 #include <rocksdb2/table/meta_blocks.cc>
@@ -109,6 +114,7 @@
 #include <rocksdb2/util/coding.cc>
 #include <rocksdb2/util/comparator.cc>
 #include <rocksdb2/util/crc32c.cc>
+#include <rocksdb2/util/db_info_dummper.cc>
 #include <rocksdb2/util/dynamic_bloom.cc>
 #include <rocksdb2/util/env.cc>
 #include <rocksdb2/util/env_hdfs.cc>
@@ -120,7 +126,9 @@
 #include <rocksdb2/util/hash_skiplist_rep.cc>
 #include <rocksdb2/util/histogram.cc>
 #include <rocksdb2/util/iostats_context.cc>
+#include <rocksdb2/util/options_helper.cc>
 #include <rocksdb2/utilities/backupable/backupable_db.cc>
+#include <rocksdb2/utilities/compacted_db/compacted_db_impl.cc>
 #include <rocksdb2/utilities/document/document_db.cc>
 #include <rocksdb2/utilities/document/json_document.cc>
 #include <rocksdb2/utilities/geodb/geodb_impl.cc>