From e8d03c7b9b01cb8b167485d0cb532d46ad7192c6 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Mon, 27 Oct 2014 11:41:44 -0700
Subject: [PATCH] Update rocksdb unity file

---
 Builds/VisualStudio2013/RippleD.vcxproj       | 52 +--------------
 .../VisualStudio2013/RippleD.vcxproj.filters  | 66 +------------------
 src/ripple/unity/rocksdb.cpp                  | 10 +--
 3 files changed, 7 insertions(+), 121 deletions(-)

diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index c18f7fcbe..74c273c1f 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -3358,11 +3358,6 @@
     </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>
@@ -3442,16 +3437,6 @@
     </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">
@@ -3470,8 +3455,6 @@
     </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">
@@ -3552,11 +3535,6 @@
     </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>
@@ -3607,6 +3585,9 @@
     </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">
@@ -3617,16 +3598,6 @@
     </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>
@@ -3692,11 +3663,6 @@
     <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>
@@ -3858,11 +3824,6 @@
     </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">
@@ -3871,11 +3832,6 @@
     <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>
@@ -3890,8 +3846,6 @@
     </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>
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 576146d90..e06a87b7c 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -511,9 +511,6 @@
     <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>
@@ -4572,12 +4569,6 @@
     <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>
@@ -4674,18 +4665,6 @@
     <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>
@@ -4713,9 +4692,6 @@
     <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>
@@ -4830,12 +4806,6 @@
     <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>
@@ -4896,6 +4866,9 @@
     <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>
@@ -4908,18 +4881,6 @@
     <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>
@@ -5001,12 +4962,6 @@
     <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>
@@ -5196,12 +5151,6 @@
     <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>
@@ -5211,12 +5160,6 @@
     <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>
@@ -5235,9 +5178,6 @@
     <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>
diff --git a/src/ripple/unity/rocksdb.cpp b/src/ripple/unity/rocksdb.cpp
index 5ed717e2f..76c95c67b 100644
--- a/src/ripple/unity/rocksdb.cpp
+++ b/src/ripple/unity/rocksdb.cpp
@@ -61,7 +61,6 @@
 #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>
@@ -77,10 +76,7 @@
 #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>
@@ -92,10 +88,9 @@
 #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>
@@ -126,9 +121,7 @@
 #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>
@@ -144,7 +137,6 @@
 #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>