Move AsyncFileBlobStore and related files to fdbclient.

fdbbackup/backup.actor.cpp

@@ -30,12 +30,12 @@
 #include "fdbclient/Status.h"
 #include "fdbclient/BackupContainer.h"
 #include "fdbclient/KeyBackedTypes.h"
-
 #include "fdbclient/RunTransaction.actor.h"
-#include "fdbrpc/Platform.h"
-#include "fdbrpc/BlobStore.h"
+#include "fdbclient/BlobStore.h"
 #include "fdbclient/json_spirit/json_spirit_writer_template.h"
 
+#include "fdbrpc/Platform.h"
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <algorithm>	// std::transform

fdbclient/AsyncFileBlobStore.actor.cpp

@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#include "AsyncFileBlobStore.actor.h"
-#include "AsyncFileReadAhead.actor.h"
+#include "fdbclient/AsyncFileBlobStore.actor.h"
+#include "fdbrpc/AsyncFileReadAhead.actor.h"
 #include "flow/UnitTest.h"
 
 Future<int64_t> AsyncFileBlobStoreRead::size() {

fdbclient/AsyncFileBlobStore.actor.h

@@ -30,13 +30,13 @@
 #include <sstream>
 #include <time.h>
 
-#include "IAsyncFile.h"
+#include "fdbrpc/IAsyncFile.h"
 #include "flow/serialize.h"
 #include "flow/Net2Packet.h"
-#include "IRateControl.h"
-#include "BlobStore.h"
-#include "md5/md5.h"
-#include "libb64/encode.h"
+#include "fdbrpc/IRateControl.h"
+#include "fdbclient/BlobStore.h"
+#include "fdbclient/md5/md5.h"
+#include "fdbclient/libb64/encode.h"
 
 ACTOR template<typename T> static Future<T> joinErrorGroup(Future<T> f, Promise<Void> p) {
 	try {

fdbclient/BackupContainer.actor.cpp

@@ -22,9 +22,9 @@
 #include "flow/Trace.h"
 #include "flow/UnitTest.h"
 #include "flow/Hash3.h"
-#include "fdbrpc/AsyncFileBlobStore.actor.h"
 #include "fdbrpc/AsyncFileReadAhead.actor.h"
 #include "fdbrpc/Platform.h"
+#include "fdbclient/AsyncFileBlobStore.actor.h"
 #include "fdbclient/Status.h"
 #include "fdbclient/SystemData.h"
 #include "fdbclient/ReadYourWrites.h"

fdbclient/BlobStore.actor.cpp

@@ -20,13 +20,13 @@
 
 #include "BlobStore.h"
 
-#include "md5/md5.h"
-#include "libb64/encode.h"
-#include "sha1/SHA1.h"
+#include "fdbclient/md5/md5.h"
+#include "fdbclient/libb64/encode.h"
+#include "fdbclient/sha1/SHA1.h"
 #include "time.h"
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#include "IAsyncFile.h"
+#include "fdbrpc/IAsyncFile.h"
 
 json_spirit::mObject BlobStoreEndpoint::Stats::getJSON() {
 	json_spirit::mObject o;

fdbclient/BlobStore.h

@@ -25,9 +25,9 @@
 #include "flow/flow.h"
 #include "flow/Net2Packet.h"
 #include "fdbclient/Knobs.h"
-#include "IRateControl.h"
-#include "HTTP.h"
-#include "JSONDoc.h"
+#include "fdbrpc/IRateControl.h"
+#include "fdbclient/HTTP.h"
+#include "fdbclient/JSONDoc.h"
 
 // Representation of all the things you need to connect to a blob store instance with some credentials.
 // Reference counted because a very large number of them could be needed.

fdbclient/HTTP.actor.cpp

@@ -18,11 +18,12 @@
  * limitations under the License.
  */
 
-#include "HTTP.h"
-#include "md5/md5.h"
-#include "libb64/encode.h"
+#include "fdbclient/HTTP.h"
+#include "fdbclient/md5/md5.h"
+#include "fdbclient/libb64/encode.h"
+#include "fdbclient/xml2json.hpp"
+
 #include <cctype>
-#include "xml2json.hpp"
 
 namespace HTTP {
 

fdbclient/HTTP.h

@@ -20,7 +20,7 @@
 
 #include "flow/flow.h"
 #include "flow/Net2Packet.h"
-#include "IRateControl.h"
+#include "fdbrpc/IRateControl.h"
 #include "fdbclient/Knobs.h"
 
 namespace HTTP {

fdbclient/JsonBuilder.h

@@ -5,7 +5,7 @@
 #include <cmath>
 #include "flow/flow.h"
 #include "flow/Trace.h"
-#include "fdbrpc/JSONDoc.h"
+#include "fdbclient/JSONDoc.h"
 
 class JsonBuilder;
 class JsonBuilderObject;

fdbclient/Status.h

@@ -21,7 +21,7 @@
 #ifndef FDBCLIENT_STATUS_H
 #define FDBCLIENT_STATUS_H
 
-#include "../fdbrpc/JSONDoc.h"
+#include "fdbclient/JSONDoc.h"
 
 // Reads the entire string s as a JSON value
 // Throws if no value can be parsed or if s contains data after the first JSON value

fdbclient/fdbclient.vcxproj

@@ -20,13 +20,14 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ActorCompiler Include="KeyRangeMap.actor.cpp" />
-    <ActorCompiler Include="NativeAPI.actor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
+    <ActorCompiler Include="AsyncFileBlobStore.actor.h">
+      <EnableCompile Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</EnableCompile>
+      <EnableCompile Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</EnableCompile>
+    </ActorCompiler>
     <ClInclude Include="Atomic.h" />
     <ClInclude Include="BackupContainer.h" />
     <ClInclude Include="BackupAgent.h" />
+    <ClInclude Include="BlobStore.h" />
     <ClInclude Include="ClientDBInfo.h" />
     <ClInclude Include="ClientLogEvents.h" />
     <ClInclude Include="ClientWorkerInterface.h" />
@@ -34,19 +35,21 @@
     <ClInclude Include="CommitTransaction.h" />
     <ClInclude Include="CoordinationInterface.h" />
     <ClInclude Include="DatabaseConfiguration.h" />
-    <ActorCompiler Include="DatabaseContext.h" />
+    <ClInclude Include="DatabaseContext.h" />
     <ActorCompiler Include="EventTypes.actor.h">
       <EnableCompile Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</EnableCompile>
       <EnableCompile Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</EnableCompile>
     </ActorCompiler>
-    <ClInclude Include="KeyBackedTypes.h" />
-    <ClInclude Include="MetricLogger.h" />
-    <ActorCompiler Include="MetricLogger.actor.cpp" />
-    <ClInclude Include="FailureMonitorClient.h" />
     <ClInclude Include="FDBOptions.g.h" />
     <ClInclude Include="FDBOptions.h" />
     <ClInclude Include="FDBTypes.h" />
+    <ClInclude Include="HTTP.h" />
+    <ClInclude Include="KeyBackedTypes.h" />
+    <ClInclude Include="MetricLogger.h" />
+    <ClInclude Include="FailureMonitorClient.h" />
     <ClInclude Include="IClientApi.h" />
+    <ClInclude Include="JsonBuilder.h" />
+    <ClInclude Include="JSONDoc.h" />
     <ClInclude Include="json_spirit\json_spirit_error_position.h" />
     <ClInclude Include="json_spirit\json_spirit_reader_template.h" />
     <ClInclude Include="json_spirit\json_spirit_value.h" />
@@ -54,8 +57,13 @@
     <ClInclude Include="json_spirit\json_spirit_writer_template.h" />
     <ClInclude Include="KeyRangeMap.h" />
     <ClInclude Include="Knobs.h" />
+    <ClInclude Include="libb64\cdecode.h" />
+    <ClInclude Include="libb64\cencode.h" />
+    <ClInclude Include="libb64\decode.h" />
+    <ClInclude Include="libb64\encode.h" />
     <ClInclude Include="ManagementAPI.h" />
     <ClInclude Include="MasterProxyInterface.h" />
+    <ClInclude Include="md5\md5.h" />
     <ClInclude Include="MonitorLeader.h" />
     <ClInclude Include="MultiVersionAssignmentVars.h" />
     <ClInclude Include="MultiVersionTransaction.h" />
@@ -66,41 +74,52 @@
     <ActorCompiler Include="RunTransaction.actor.h" />
     <ClInclude Include="RYWIterator.h" />
     <ClInclude Include="Schemas.h" />
+    <ClInclude Include="sha1\SHA1.h" />
     <ClInclude Include="SnapshotCache.h" />
     <ClInclude Include="Status.h" />
     <ClInclude Include="StatusClient.h" />
     <ClInclude Include="StorageServerInterface.h" />
+    <ClInclude Include="Subspace.h" />
     <ClInclude Include="SystemData.h" />
     <ClInclude Include="TaskBucket.h" />
     <ClInclude Include="ThreadSafeTransaction.h" />
+    <ClInclude Include="Tuple.h" />
     <ActorCompiler Include="VersionedMap.actor.h">
       <EnableCompile Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</EnableCompile>
       <EnableCompile Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</EnableCompile>
     </ActorCompiler>
     <ClInclude Include="VersionedMap.h" />
     <ClInclude Include="WriteMap.h" />
-    <ClInclude Include="Subspace.h" />
-    <ClInclude Include="Tuple.h" />
-    <ClInclude Include="JsonBuilder.h" />
+    <ClInclude Include="xml2json.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ActorCompiler Include="FailureMonitorClient.actor.cpp" />
-    <ActorCompiler Include="ReadYourWrites.actor.cpp" />
+    <ActorCompiler Include="AsyncFileBlobStore.actor.cpp" />
+    <ClCompile Include="AutoPublicAddress.cpp" />
     <ActorCompiler Include="BackupAgentBase.actor.cpp" />
     <ActorCompiler Include="BackupContainer.actor.cpp" />
+    <ActorCompiler Include="BlobStore.actor.cpp" />
     <ActorCompiler Include="DatabaseBackupAgent.actor.cpp" />
     <ClCompile Include="DatabaseConfiguration.cpp" />
-    <ClCompile Include="AutoPublicAddress.cpp" />
+    <ActorCompiler Include="FailureMonitorClient.actor.cpp" />
     <ClCompile Include="FDBOptions.g.cpp" />
     <ActorCompiler Include="FileBackupAgent.actor.cpp" />
+    <ActorCompiler Include="HTTP.actor.cpp" />
+    <ActorCompiler Include="KeyRangeMap.actor.cpp" />
     <ClCompile Include="Knobs.cpp" />
+    <ClCompile Include="libb64\cdecode.c" />
+    <ClCompile Include="libb64\cencode.c" />
+    <ClCompile Include="md5\md5.c" />
+    <ActorCompiler Include="MetricLogger.actor.cpp" />
     <ActorCompiler Include="MonitorLeader.actor.cpp" />
     <ActorCompiler Include="ManagementAPI.actor.cpp" />
     <ActorCompiler Include="MultiVersionTransaction.actor.cpp" />
+    <ActorCompiler Include="NativeAPI.actor.cpp" />
+    <ActorCompiler Include="ReadYourWrites.actor.cpp" />
     <ClCompile Include="RYWIterator.cpp" />
     <ActorCompiler Include="StatusClient.actor.cpp" />
     <ClCompile Include="Schemas.cpp" />
     <ClCompile Include="SystemData.cpp" />
+    <ClCompile Include="sha1\SHA1.cpp" />
     <ActorCompiler Include="ThreadSafeTransaction.actor.cpp" />
     <ActorCompiler Include="TaskBucket.actor.cpp" />
     <ClCompile Include="Subspace.cpp" />

fdbclient/xml2json.hpp

@@ -9,19 +9,19 @@
 #include <string>
 #include <cctype>
 
-#include "rapidxml/rapidxml.hpp"
-#include "rapidxml/rapidxml_utils.hpp"
-#include "rapidxml/rapidxml_print.hpp"
+#include "fdbclient/rapidxml/rapidxml.hpp"
+#include "fdbclient/rapidxml/rapidxml_utils.hpp"
+#include "fdbclient/rapidxml/rapidxml_print.hpp"
 
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
+#include "fdbclient/rapidjson/document.h"
+#include "fdbclient/rapidjson/prettywriter.h"
+#include "fdbclient/rapidjson/encodedstream.h"
+#include "fdbclient/rapidjson/stringbuffer.h"
+#include "fdbclient/rapidjson/reader.h"
+#include "fdbclient/rapidjson/writer.h"
+#include "fdbclient/rapidjson/filereadstream.h"
+#include "fdbclient/rapidjson/filewritestream.h"
+#include "fdbclient/rapidjson/error/en.h"
 
 /* [Start] This part is configurable */
 static const char xml2json_text_additional_name[] = "#text";

fdbrpc/fdbrpc.vcxproj

@@ -12,9 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <ActorCompiler Include="ActorFuzz.actor.cpp" />
-    <ActorCompiler Include="AsyncFileBlobStore.actor.cpp" />
-    <ActorCompiler Include="BlobStore.actor.cpp" />
-    <ActorCompiler Include="HTTP.actor.cpp" />
     <ActorCompiler Include="AsyncFileCached.actor.cpp" />
     <ActorCompiler Include="AsyncFileNonDurable.actor.cpp" />
     <ActorCompiler Include="dsltest.actor.cpp" />
@@ -25,10 +22,6 @@
     <ActorCompiler Include="IAsyncFile.actor.cpp" />
     <ClCompile Include="crc32c.cpp" />
     <ClCompile Include="generated-constants.cpp" />
-    <ClCompile Include="sha1\SHA1.cpp" />
-    <ClCompile Include="libb64\cencode.c" />
-    <ClCompile Include="libb64\cdecode.c" />
-    <ClCompile Include="md5\md5.c" />
     <ClCompile Include="Platform.cpp" />
     <ClCompile Include="AsyncFileWriteChecker.cpp" />
     <ClCompile Include="libcoroutine\Common.c" />
@@ -60,9 +53,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ActorFuzz.h" />
-    <ActorCompiler Include="AsyncFileBlobStore.actor.h">
-      <EnableCompile>false</EnableCompile>
-    </ActorCompiler>
     <ActorCompiler Include="AsyncFileEIO.actor.h">
       <EnableCompile>false</EnableCompile>
     </ActorCompiler>
@@ -95,22 +85,13 @@
     <ActorCompiler Include="genericactors.actor.h">
       <EnableCompile>false</EnableCompile>
     </ActorCompiler>
-    <ClInclude Include="JSONDoc.h" />
     <ClInclude Include="linux_kaio.h" />
     <ClInclude Include="LoadPlugin.h" />
-    <ClInclude Include="sha1\SHA1.h" />
-    <ClInclude Include="libb64\encode.h" />
-    <ClInclude Include="libb64\cencode.h" />
-    <ClInclude Include="libb64\decode.h" />
-    <ClInclude Include="libb64\cdecode.h" />
-    <ClInclude Include="md5\md5.h" />
     <ClInclude Include="IAsyncFile.h" />
     <ClInclude Include="IRateControl.h" />
     <ClInclude Include="Platform.h" />
     <ClInclude Include="fdbrpc.h" />
     <ClInclude Include="FlowTransport.h" />
-    <ClInclude Include="BlobStore.h" />
-    <ClInclude Include="HTTP.h" />
     <ClInclude Include="ITLSPlugin.h" />
     <ClInclude Include="libcoroutine\Base.h" />
     <ClInclude Include="libcoroutine\Common.h" />
@@ -131,7 +112,6 @@
     <ClInclude Include="Smoother.h" />
     <ClInclude Include="TLSConnection.h" />
     <ClInclude Include="TraceFileIO.h" />
-    <ClInclude Include="xml2json.hpp" />
     <ClInclude Include="zlib\zlib.h" />
     <ClInclude Include="zlib\deflate.h" />
     <ClInclude Include="zlib\gzguts.h" />

fdbrpc/fdbrpc.vcxproj.filters

@@ -19,10 +19,6 @@
     <ActorCompiler Include="FlowTransport.actor.cpp" />
     <ActorCompiler Include="ActorFuzz.actor.cpp" />
     <ActorCompiler Include="batcher.actor.h" />
-    <ActorCompiler Include="AsyncFileBlobStore.actor.cpp" />
-    <ActorCompiler Include="BlobStore.actor.cpp" />
-    <ActorCompiler Include="HTTP.actor.cpp" />
-    <ActorCompiler Include="AsyncFileBlobStore.actor.h" />
     <ActorCompiler Include="AsyncFileReadAhead.actor.h" />
     <ActorCompiler Include="IAsyncFile.actor.cpp" />
   </ItemGroup>
@@ -78,10 +74,6 @@
     <ClCompile Include="Platform.cpp" />
     <ClCompile Include="QueueModel.cpp" />
     <ClCompile Include="TraceFileIO.cpp" />
-    <ClCompile Include="sha1\SHA1.cpp" />
-    <ClCompile Include="libb64\cencode.c" />
-    <ClCompile Include="libb64\cdecode.c" />
-    <ClCompile Include="md5\md5.c" />
     <ClCompile Include="Replication.cpp" />
     <ClCompile Include="ReplicationTypes.cpp" />
     <ClCompile Include="ReplicationPolicy.cpp" />
@@ -154,23 +146,13 @@
     <ClInclude Include="Smoother.h" />
     <ClInclude Include="TraceFileIO.h" />
     <ClInclude Include="TLSConnection.h" />
-    <ClInclude Include="sha1\SHA1.h" />
-    <ClInclude Include="libb64\encode.h" />
-    <ClInclude Include="libb64\cencode.h" />
-    <ClInclude Include="libb64\decode.h" />
-    <ClInclude Include="libb64\cdecode.h" />
-    <ClInclude Include="md5\md5.h" />
     <ClInclude Include="IRateControl.h" />
-    <ClInclude Include="BlobStore.h" />
-    <ClInclude Include="HTTP.h" />
     <ClInclude Include="Replication.h" />
     <ClInclude Include="ReplicationTypes.h" />
     <ClInclude Include="ReplicationPolicy.h" />
     <ClInclude Include="crc32c.h" />
     <ClInclude Include="ReplicationUtils.h" />
-    <ClInclude Include="xml2json.hpp" />
     <ClInclude Include="AsyncFileWriteChecker.h" />
-    <ClInclude Include="JSONDoc.h" />
     <ClInclude Include="linux_kaio.h" />
     <ClInclude Include="LoadPlugin.h" />
   </ItemGroup>
@@ -182,4 +164,4 @@
       <UniqueIdentifier>{b79fbb2a-5d80-4135-b363-f6de83e62e73}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>