ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update rocksdb

Browse Source
This commit is contained in:
Torrie Fischer
2014-10-01 11:21:46 -07:00
committed by Nik Bougalis
parent 225f8ac12f
commit a85fbf69e0
4 changed files with 152 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Builds/VisualStudio2013/RippleD.vcxproj
View File

@@ -3578,6 +3578,11 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\file_indexer.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>
@@ -3637,11 +3642,6 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\table_properties_collector.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\tailing_iter.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\tailing_iter.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\transaction_log_impl.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -3662,6 +3662,16 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\write_batch_internal.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>
<ClInclude Include="..\..\src\rocksdb2\hdfs\env_hdfs.h">
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\c.h">
@@ -3680,6 +3690,8 @@
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\flush_block_policy.h">
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\immutable_options.h">
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\iostats_context.h">
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\iterator.h">
@@ -3760,6 +3772,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>
@@ -3800,14 +3817,16 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\cuckoo_table_builder.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\cuckoo_table_factory.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\cuckoo_table_factory.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\cuckoo_table_reader.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</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">
@@ -3818,6 +3837,16 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\format.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\iterator.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -3883,6 +3912,11 @@
<ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\rocksdb2\utilities\compacted_db\compacted_db_impl.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\utilities\compacted_db\compacted_db_impl.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -3969,6 +4003,9 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\crc32c.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\db_info_dummper.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\rocksdb2\util\dynamic_bloom.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -4041,6 +4078,11 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\murmurhash.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\mutable_cf_options.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\mutable_cf_options.h">
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\util\mutexlock.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\options.cc">
@@ -4049,6 +4091,11 @@
<ClCompile Include="..\..\src\rocksdb2\util\options_builder.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\rocksdb2\util\options_helper.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\options_helper.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\perf_context.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -4063,6 +4110,8 @@
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\rate_limiter.h">
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\util\scoped_arena_iterator.h">
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\skiplistrep.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>

81
Builds/VisualStudio2013/RippleD.vcxproj.filters
View File

@@ -535,6 +535,9 @@
<Filter Include="rocksdb2\utilities\backupable">
<UniqueIdentifier>{9127B497-2610-2304-EEC9-8BEFBE9EA84E}</UniqueIdentifier>
</Filter>
<Filter Include="rocksdb2\utilities\compacted_db">
<UniqueIdentifier>{15F05867-678D-11FA-A5FA-EC735FAA0DC7}</UniqueIdentifier>
</Filter>
<Filter Include="rocksdb2\utilities\document">
<UniqueIdentifier>{54BB5EB5-AAE6-285E-E486-052F58B9C667}</UniqueIdentifier>
</Filter>
@@ -4875,6 +4878,12 @@
<ClInclude Include="..\..\src\rocksdb2\db\file_indexer.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\flush_scheduler.cc">
<Filter>rocksdb2\db</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\flush_scheduler.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\forward_iterator.cc">
<Filter>rocksdb2\db</Filter>
</ClCompile>
@@ -4947,12 +4956,6 @@
<ClInclude Include="..\..\src\rocksdb2\db\table_properties_collector.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\tailing_iter.cc">
<Filter>rocksdb2\db</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\tailing_iter.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\transaction_log_impl.cc">
<Filter>rocksdb2\db</Filter>
</ClCompile>
@@ -4977,6 +4980,18 @@
<ClInclude Include="..\..\src\rocksdb2\db\write_batch_internal.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\write_controller.cc">
<Filter>rocksdb2\db</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\write_controller.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\db\write_thread.cc">
<Filter>rocksdb2\db</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\db\write_thread.h">
<Filter>rocksdb2\db</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\hdfs\env_hdfs.h">
<Filter>rocksdb2\hdfs</Filter>
</ClInclude>
@@ -5004,6 +5019,9 @@
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\flush_block_policy.h">
<Filter>rocksdb2\include\rocksdb</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\immutable_options.h">
<Filter>rocksdb2\include\rocksdb</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\include\rocksdb\iostats_context.h">
<Filter>rocksdb2\include\rocksdb</Filter>
</ClInclude>
@@ -5118,6 +5136,12 @@
<ClInclude Include="..\..\src\rocksdb2\table\block.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\block_based_filter_block.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\block_based_filter_block.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\block_based_table_builder.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
@@ -5166,15 +5190,18 @@
<ClInclude Include="..\..\src\rocksdb2\table\cuckoo_table_builder.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\cuckoo_table_factory.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\cuckoo_table_factory.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\cuckoo_table_reader.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\cuckoo_table_reader.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\filter_block.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\filter_block.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
@@ -5187,6 +5214,18 @@
<ClInclude Include="..\..\src\rocksdb2\table\format.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\full_filter_block.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\full_filter_block.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\get_context.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\table\get_context.h">
<Filter>rocksdb2\table</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\table\iterator.cc">
<Filter>rocksdb2\table</Filter>
</ClCompile>
@@ -5268,6 +5307,12 @@
<ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
<Filter>rocksdb2\utilities\backupable</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rocksdb2\utilities\compacted_db\compacted_db_impl.cc">
<Filter>rocksdb2\utilities\compacted_db</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\utilities\compacted_db\compacted_db_impl.h">
<Filter>rocksdb2\utilities\compacted_db</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
<Filter>rocksdb2\utilities\document</Filter>
</ClCompile>
@@ -5370,6 +5415,9 @@
<ClInclude Include="..\..\src\rocksdb2\util\crc32c.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\db_info_dummper.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rocksdb2\util\dynamic_bloom.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>
@@ -5454,6 +5502,12 @@
<ClInclude Include="..\..\src\rocksdb2\util\murmurhash.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\mutable_cf_options.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\mutable_cf_options.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\util\mutexlock.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
@@ -5463,6 +5517,12 @@
<ClCompile Include="..\..\src\rocksdb2\util\options_builder.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rocksdb2\util\options_helper.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>
<ClInclude Include="..\..\src\rocksdb2\util\options_helper.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\perf_context.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>
@@ -5481,6 +5541,9 @@
<ClInclude Include="..\..\src\rocksdb2\util\rate_limiter.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rocksdb2\util\scoped_arena_iterator.h">
<Filter>rocksdb2\util</Filter>
</ClInclude>
<ClCompile Include="..\..\src\rocksdb2\util\skiplistrep.cc">
<Filter>rocksdb2\util</Filter>
</ClCompile>

23
src/ripple/nodestore/backend/RocksDBFactory.cpp
View File

@@ -85,7 +85,6 @@ public:
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 @@ public:
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 @@ public:
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 @@ public:
}
}
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 @@ public:
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 ()

13
src/ripple/unity/rocksdb.cpp
View File

@@ -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>
@@ -136,6 +144,7 @@
#include <rocksdb2/util/log_buffer.cc>
#include <rocksdb2/util/logging.cc>
#include <rocksdb2/util/murmurhash.cc>
#include <rocksdb2/util/mutable_cf_options.cc>
#include <rocksdb2/util/options_builder.cc>
#include <rocksdb2/util/options.cc>
#include <rocksdb2/util/perf_context.cc>