From 101a4808a0e76968fad2eca7cf1471330b357792 Mon Sep 17 00:00:00 2001
From: Torrie Fischer <torrie@ripple.com>
Date: Wed, 27 Aug 2014 11:25:59 -0700
Subject: [PATCH] Update includes and scons

---
 SConstruct                   |   6 +-
 src/ripple/unity/rocksdb.cpp | 206 +++++++++++++++++------------------
 src/ripple/unity/rocksdb.h   |  46 ++++----
 3 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/SConstruct b/SConstruct
index 0838a36e81..9bb1ca3e88 100644
--- a/SConstruct
+++ b/SConstruct
@@ -572,7 +572,7 @@ for toolchain in all_toolchains:
         objects.append(addSource('src/ripple/unity/nodestore.cpp', env, variant_dirs, [
             'src/leveldb/include',
             #'src/hyperleveldb/include', # hyper
-            'src/rocksdb/include',
+            'src/rocksdb2/include',
             ]))
 
         objects.append(addSource('src/ripple/unity/leveldb.cpp', env, variant_dirs, [
@@ -589,8 +589,8 @@ for toolchain in all_toolchains:
             ]))
 
         objects.append(addSource('src/ripple/unity/rocksdb.cpp', env, variant_dirs, [
-            'src/rocksdb',
-            'src/rocksdb/include',
+            'src/rocksdb2',
+            'src/rocksdb2/include',
             'src/snappy/snappy',
             'src/snappy/config',
             ]))
diff --git a/src/ripple/unity/rocksdb.cpp b/src/ripple/unity/rocksdb.cpp
index 95f83057da..58cd4dfd41 100644
--- a/src/ripple/unity/rocksdb.cpp
+++ b/src/ripple/unity/rocksdb.cpp
@@ -48,109 +48,109 @@
 #define NDEBUG
 #endif
 
-#include <rocksdb/db/builder.cc>
-#include <rocksdb/db/c.cc>
-#include <rocksdb/db/column_family.cc>
-#include <rocksdb/db/compaction.cc>
-#include <rocksdb/db/compaction_picker.cc>
-#include <rocksdb/db/db_filesnapshot.cc>
-#include <rocksdb/db/dbformat.cc>
-#include <rocksdb/db/db_impl.cc>
-#include <rocksdb/db/db_impl_debug.cc>
-#include <rocksdb/db/db_impl_readonly.cc>
-#include <rocksdb/db/db_iter.cc>
-#include <rocksdb/db/file_indexer.cc>
-#include <rocksdb/db/filename.cc>
-#include <rocksdb/db/forward_iterator.cc>
-#include <rocksdb/db/internal_stats.cc>
-#include <rocksdb/db/log_reader.cc>
-#include <rocksdb/db/log_writer.cc>
-#include <rocksdb/db/memtable.cc>
-#include <rocksdb/db/memtable_list.cc>
-#include <rocksdb/db/merge_helper.cc>
-#include <rocksdb/db/merge_operator.cc>
-#include <rocksdb/db/repair.cc>
-#include <rocksdb/db/table_cache.cc>
-#include <rocksdb/db/table_properties_collector.cc>
-#include <rocksdb/db/tailing_iter.cc>
-#include <rocksdb/db/transaction_log_impl.cc>
-#include <rocksdb/db/version_edit.cc>
-#include <rocksdb/db/version_set.cc>
-#include <rocksdb/db/write_batch.cc>
-#include <rocksdb/table/adaptive_table_factory.cc>
-#include <rocksdb/table/block_based_table_builder.cc>
-#include <rocksdb/table/block_based_table_factory.cc>
-#include <rocksdb/table/block_based_table_reader.cc>
-#include <rocksdb/table/block_builder.cc>
-#include <rocksdb/table/block.cc>
-#include <rocksdb/table/block_hash_index.cc>
-#include <rocksdb/table/block_prefix_index.cc>
-#include <rocksdb/table/bloom_block.cc>
-#include <rocksdb/table/cuckoo_table_builder.cc>
-#include <rocksdb/table/cuckoo_table_reader.cc>
-#include <rocksdb/table/filter_block.cc>
-#include <rocksdb/table/flush_block_policy.cc>
-#include <rocksdb/table/format.cc>
-#include <rocksdb/table/iterator.cc>
-#include <rocksdb/table/merger.cc>
-#include <rocksdb/table/meta_blocks.cc>
-#include <rocksdb/table/plain_table_builder.cc>
-#include <rocksdb/table/plain_table_factory.cc>
-#include <rocksdb/table/plain_table_index.cc>
-#include <rocksdb/table/plain_table_key_coding.cc>
-#include <rocksdb/table/plain_table_reader.cc>
-#include <rocksdb/table/table_properties.cc>
-#include <rocksdb/table/two_level_iterator.cc>
-#include <rocksdb/util/arena.cc>
-#include <rocksdb/util/auto_roll_logger.cc>
-#include <rocksdb/util/blob_store.cc>
-#include <rocksdb/util/bloom.cc>
-#include <rocksdb/util/cache.cc>
-#include <rocksdb/util/coding.cc>
-#include <rocksdb/util/comparator.cc>
-#include <rocksdb/util/crc32c.cc>
-#include <rocksdb/util/dynamic_bloom.cc>
-#include <rocksdb/util/env.cc>
-#include <rocksdb/util/env_hdfs.cc>
-#include <rocksdb/util/env_posix.cc>
-#include <rocksdb/util/filter_policy.cc>
-#include <rocksdb/util/hash.cc>
-#include <rocksdb/util/hash_cuckoo_rep.cc>
-#include <rocksdb/util/hash_linklist_rep.cc>
-#include <rocksdb/util/hash_skiplist_rep.cc>
-#include <rocksdb/util/histogram.cc>
-#include <rocksdb/util/iostats_context.cc>
-#include <rocksdb/utilities/backupable/backupable_db.cc>
-#include <rocksdb/utilities/document/document_db.cc>
-#include <rocksdb/utilities/document/json_document.cc>
-#include <rocksdb/utilities/geodb/geodb_impl.cc>
-#include <rocksdb/utilities/merge_operators/put.cc>
-#include <rocksdb/utilities/merge_operators/string_append/stringappend2.cc>
-#include <rocksdb/utilities/merge_operators/string_append/stringappend.cc>
-#include <rocksdb/utilities/merge_operators/uint64add.cc>
-#include <rocksdb/utilities/redis/redis_lists.cc>
-#include <rocksdb/utilities/spatialdb/spatial_db.cc>
-#include <rocksdb/utilities/ttl/db_ttl_impl.cc>
-#include <rocksdb/util/ldb_cmd.cc>
-#include <rocksdb/util/ldb_tool.cc>
-#include <rocksdb/util/log_buffer.cc>
-#include <rocksdb/util/logging.cc>
-#include <rocksdb/util/murmurhash.cc>
-#include <rocksdb/util/options_builder.cc>
-#include <rocksdb/util/options.cc>
-#include <rocksdb/util/perf_context.cc>
-#include <rocksdb/util/rate_limiter.cc>
-#include <rocksdb/util/skiplistrep.cc>
-#include <rocksdb/util/slice.cc>
-#include <rocksdb/util/statistics.cc>
-#include <rocksdb/util/status.cc>
-#include <rocksdb/util/string_util.cc>
-#include <rocksdb/util/sync_point.cc>
-#include <rocksdb/util/thread_local.cc>
-#include <rocksdb/util/vectorrep.cc>
-#include <rocksdb/util/xxhash.cc>
-#include <rocksdb/port/stack_trace.cc>
-#include <rocksdb/port/port_posix.cc>
+#include <rocksdb2/db/builder.cc>
+#include <rocksdb2/db/c.cc>
+#include <rocksdb2/db/column_family.cc>
+#include <rocksdb2/db/compaction.cc>
+#include <rocksdb2/db/compaction_picker.cc>
+#include <rocksdb2/db/db_filesnapshot.cc>
+#include <rocksdb2/db/dbformat.cc>
+#include <rocksdb2/db/db_impl.cc>
+#include <rocksdb2/db/db_impl_debug.cc>
+#include <rocksdb2/db/db_impl_readonly.cc>
+#include <rocksdb2/db/db_iter.cc>
+#include <rocksdb2/db/file_indexer.cc>
+#include <rocksdb2/db/filename.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/memtable.cc>
+#include <rocksdb2/db/memtable_list.cc>
+#include <rocksdb2/db/merge_helper.cc>
+#include <rocksdb2/db/merge_operator.cc>
+#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/table/adaptive_table_factory.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_reader.cc>
+#include <rocksdb2/table/filter_block.cc>
+#include <rocksdb2/table/flush_block_policy.cc>
+#include <rocksdb2/table/format.cc>
+#include <rocksdb2/table/iterator.cc>
+#include <rocksdb2/table/merger.cc>
+#include <rocksdb2/table/meta_blocks.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/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/comparator.cc>
+#include <rocksdb2/util/crc32c.cc>
+#include <rocksdb2/util/dynamic_bloom.cc>
+#include <rocksdb2/util/env.cc>
+#include <rocksdb2/util/env_hdfs.cc>
+#include <rocksdb2/util/env_posix.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/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/status.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/xxhash.cc>
+#include <rocksdb2/port/stack_trace.cc>
+#include <rocksdb2/port/port_posix.cc>
 
 const char* rocksdb_build_git_sha = "<none>";
 const char* rocksdb_build_git_datetime = "<none>";
diff --git a/src/ripple/unity/rocksdb.h b/src/ripple/unity/rocksdb.h
index fca71dcca8..d014879b1b 100644
--- a/src/ripple/unity/rocksdb.h
+++ b/src/ripple/unity/rocksdb.h
@@ -48,29 +48,29 @@
 
 #if RIPPLE_ROCKSDB_AVAILABLE
 #define SNAPPY
-//#include <rocksdb/port/port_posix.h>
-#include <rocksdb/include/rocksdb/cache.h>
-#include <rocksdb/include/rocksdb/compaction_filter.h>
-#include <rocksdb/include/rocksdb/comparator.h>
-#include <rocksdb/include/rocksdb/db.h>
-#include <rocksdb/include/rocksdb/env.h>
-#include <rocksdb/include/rocksdb/filter_policy.h>
-#include <rocksdb/include/rocksdb/flush_block_policy.h>
-#include <rocksdb/include/rocksdb/iterator.h>
-#include <rocksdb/include/rocksdb/memtablerep.h>
-#include <rocksdb/include/rocksdb/merge_operator.h>
-#include <rocksdb/include/rocksdb/options.h>
-#include <rocksdb/include/rocksdb/perf_context.h>
-#include <rocksdb/include/rocksdb/slice.h>
-#include <rocksdb/include/rocksdb/slice_transform.h>
-#include <rocksdb/include/rocksdb/statistics.h>
-#include <rocksdb/include/rocksdb/status.h>
-#include <rocksdb/include/rocksdb/table.h>
-#include <rocksdb/include/rocksdb/table_properties.h>
-#include <rocksdb/include/rocksdb/transaction_log.h>
-#include <rocksdb/include/rocksdb/types.h>
-#include <rocksdb/include/rocksdb/universal_compaction.h>
-#include <rocksdb/include/rocksdb/write_batch.h>
+//#include <rocksdb2/port/port_posix.h>
+#include <rocksdb2/include/rocksdb/cache.h>
+#include <rocksdb2/include/rocksdb/compaction_filter.h>
+#include <rocksdb2/include/rocksdb/comparator.h>
+#include <rocksdb2/include/rocksdb/db.h>
+#include <rocksdb2/include/rocksdb/env.h>
+#include <rocksdb2/include/rocksdb/filter_policy.h>
+#include <rocksdb2/include/rocksdb/flush_block_policy.h>
+#include <rocksdb2/include/rocksdb/iterator.h>
+#include <rocksdb2/include/rocksdb/memtablerep.h>
+#include <rocksdb2/include/rocksdb/merge_operator.h>
+#include <rocksdb2/include/rocksdb/options.h>
+#include <rocksdb2/include/rocksdb/perf_context.h>
+#include <rocksdb2/include/rocksdb/slice.h>
+#include <rocksdb2/include/rocksdb/slice_transform.h>
+#include <rocksdb2/include/rocksdb/statistics.h>
+#include <rocksdb2/include/rocksdb/status.h>
+#include <rocksdb2/include/rocksdb/table.h>
+#include <rocksdb2/include/rocksdb/table_properties.h>
+#include <rocksdb2/include/rocksdb/transaction_log.h>
+#include <rocksdb2/include/rocksdb/types.h>
+#include <rocksdb2/include/rocksdb/universal_compaction.h>
+#include <rocksdb2/include/rocksdb/write_batch.h>
 
 #endif