Skip to content

Commit 268093a

Browse files
author
Robert Escriva
committed
Adjust all includes to be relative to the root.
Remove the use of relative paths. A header at foo/bar.h could be included by files under foo/ with "bar.h", but would be included everywhere else as "foo/bar.h". Adjust so that every include references such a header with the latter form. Signed-off-by: Robert Escriva <rescriva@dropbox.com>
1 parent bf6b3f5 commit 268093a

File tree

318 files changed

+764
-764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+764
-764
lines changed

fdbcli/FlowLineNoise.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "FlowLineNoise.h"
21+
#include "fdbcli/FlowLineNoise.h"
2222
#include "flow/IThreadPool.h"
2323

2424
#define BOOST_SYSTEM_NO_LIB
@@ -30,7 +30,7 @@
3030

3131
#if __unixish__
3232
#define HAVE_LINENOISE 1
33-
#include "linenoise/linenoise.h"
33+
#include "fdbcli/linenoise/linenoise.h"
3434
#else
3535
#define HAVE_LINENOISE 0
3636
#endif

fdbcli/fdbcli.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
#include "flow/SimpleOpt.h"
4040

41-
#include "FlowLineNoise.h"
41+
#include "fdbcli/FlowLineNoise.h"
4242

4343
#include <signal.h>
4444

fdbclient/Atomic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define FLOW_FDBCLIENT_ATOMIC_H
2323
#pragma once
2424

25-
#include "CommitTransaction.h"
25+
#include "fdbclient/CommitTransaction.h"
2626

2727
static ValueRef doLittleEndianAdd(const Optional<ValueRef>& existingValueOptional, const ValueRef& otherOperand, Arena& ar) {
2828
const ValueRef& existingValue = existingValueOptional.present() ? existingValueOptional.get() : StringRef();

fdbclient/AutoPublicAddress.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#define BOOST_REGEX_NO_LIB
2727
#include "boost/asio.hpp"
2828

29-
#include "CoordinationInterface.h"
29+
#include "fdbclient/CoordinationInterface.h"
3030

3131
uint32_t determinePublicIPAutomatically( ClusterConnectionString const& ccs ) {
3232
try {

fdbclient/BackupAgent.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
#pragma once
2424

2525
#include "flow/flow.h"
26-
#include "NativeAPI.h"
27-
#include "TaskBucket.h"
28-
#include "Notified.h"
29-
#include <fdbrpc/IAsyncFile.h>
30-
#include "KeyBackedTypes.h"
26+
#include "fdbclient/NativeAPI.h"
27+
#include "fdbclient/TaskBucket.h"
28+
#include "fdbclient/Notified.h"
29+
#include "fdbrpc/IAsyncFile.h"
30+
#include "fdbclient/KeyBackedTypes.h"
3131
#include <ctime>
3232
#include <climits>
33-
#include "BackupContainer.h"
33+
#include "fdbclient/BackupContainer.h"
3434

3535
class BackupAgentBase : NonCopyable {
3636
public:

fdbclient/BackupAgentBase.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "BackupAgent.h"
21+
#include "fdbclient/BackupAgent.h"
2222
#include "fdbrpc/simulator.h"
2323
#include "flow/ActorCollection.h"
2424

fdbclient/BackupContainer.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "BackupContainer.h"
21+
#include "fdbclient/BackupContainer.h"
2222
#include "flow/Trace.h"
2323
#include "flow/UnitTest.h"
2424
#include "flow/Hash3.h"

fdbclient/BackupContainer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#include "flow/flow.h"
2424
#include "fdbrpc/IAsyncFile.h"
25-
#include "FDBTypes.h"
25+
#include "fdbclient/FDBTypes.h"
2626
#include "fdbclient/NativeAPI.h"
27-
#include "ReadYourWrites.h"
27+
#include "fdbclient/ReadYourWrites.h"
2828
#include <vector>
2929

3030
Future<Optional<int64_t>> timeKeeperEpochsFromVersion(Version const &v, Reference<ReadYourWritesTransaction> const &tr);

fdbclient/ClientDBInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define FDBCLIENT_CLIENTDBINFO_H
2323
#pragma once
2424

25-
#include "MasterProxyInterface.h"
25+
#include "fdbclient/MasterProxyInterface.h"
2626

2727
// ClientDBInfo is all the information needed by a database client to access the database
2828
// It is returned (and kept up to date) by the OpenDatabaseRequest interface of ClusterInterface

fdbclient/ClientWorkerInterface.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#define FDBCLIENT_CLIENTWORKERINTERFACE_H
2323
#pragma once
2424

25-
#include "FDBTypes.h"
25+
#include "fdbclient/FDBTypes.h"
2626
#include "fdbrpc/FailureMonitor.h"
27-
#include "Status.h"
28-
#include "ClientDBInfo.h"
27+
#include "fdbclient/Status.h"
28+
#include "fdbclient/ClientDBInfo.h"
2929

3030
// Streams from WorkerInterface that are safe and useful to call from a client.
3131
// A ClientWorkerInterface is embedded as the first element of a WorkerInterface.

fdbclient/ClusterInterface.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#define FDBCLIENT_ClusterInterface_H
2323
#pragma once
2424

25-
#include "FDBTypes.h"
25+
#include "fdbclient/FDBTypes.h"
2626
#include "fdbrpc/FailureMonitor.h"
27-
#include "Status.h"
28-
#include "ClientDBInfo.h"
29-
#include "ClientWorkerInterface.h"
27+
#include "fdbclient/Status.h"
28+
#include "fdbclient/ClientDBInfo.h"
29+
#include "fdbclient/ClientWorkerInterface.h"
3030

3131
struct ClusterInterface {
3232
RequestStream< struct OpenDatabaseRequest > openDatabase;

fdbclient/CommitTransaction.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define FLOW_FDBCLIENT_COMMITTRANSACTION_H
2323
#pragma once
2424

25-
#include "FDBTypes.h"
25+
#include "fdbclient/FDBTypes.h"
2626

2727
static const char * typeString[] = { "SetValue", "ClearRange", "AddValue", "DebugKeyRange", "DebugKey", "NoOp", "And", "Or", "Xor", "AppendIfFits", "AvailableForReuse", "Reserved_For_LogProtocolMessage", "Max", "Min", "SetVersionstampedKey", "SetVersionstampedValue", "ByteMin", "ByteMax", "MinV2", "AndV2" };
2828

fdbclient/CoordinationInterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define FDBCLIENT_COORDINATIONINTERFACE_H
2323
#pragma once
2424

25-
#include "FDBTypes.h"
25+
#include "fdbclient/FDBTypes.h"
2626
#include "fdbrpc/fdbrpc.h"
2727
#include "fdbrpc/Locality.h"
2828

fdbclient/DatabaseBackupAgent.actor.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "BackupAgent.h"
21+
#include "fdbclient/BackupAgent.h"
2222
#include <ctime>
2323
#include <climits>
2424
#include "fdbrpc/IAsyncFile.h"
2525
#include "flow/genericactors.actor.h"
2626
#include "flow/Hash3.h"
2727
#include <numeric>
28-
#include "ManagementAPI.h"
29-
#include "KeyBackedTypes.h"
28+
#include "fdbclient/ManagementAPI.h"
29+
#include "fdbclient/KeyBackedTypes.h"
3030

3131
const Key DatabaseBackupAgent::keyAddPrefix = LiteralStringRef("add_prefix");
3232
const Key DatabaseBackupAgent::keyRemovePrefix = LiteralStringRef("remove_prefix");

fdbclient/DatabaseConfiguration.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "DatabaseConfiguration.h"
21+
#include "fdbclient/DatabaseConfiguration.h"
2222
#include "fdbclient/SystemData.h"
2323

2424
DatabaseConfiguration::DatabaseConfiguration()

fdbclient/DatabaseContext.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#define DatabaseContext_h
2323
#pragma once
2424

25-
#include "NativeAPI.h"
26-
#include "KeyRangeMap.h"
27-
#include "MasterProxyInterface.h"
28-
#include "ClientDBInfo.h"
25+
#include "fdbclient/NativeAPI.h"
26+
#include "fdbclient/KeyRangeMap.h"
27+
#include "fdbclient/MasterProxyInterface.h"
28+
#include "fdbclient/ClientDBInfo.h"
2929
#include "fdbrpc/QueueModel.h"
3030
#include "fdbrpc/MultiInterface.h"
3131
#include "flow/TDMetric.actor.h"
32-
#include "EventTypes.actor.h"
32+
#include "fdbclient/EventTypes.actor.h"
3333
#include "fdbrpc/ContinuousSample.h"
3434

3535
class LocationInfo : public MultiInterface<StorageServerInterface> {

fdbclient/EventTypes.actor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// When actually compiled (NO_INTELLISENSE), include the generated version of this file. In intellisense use the source version.
2424
#if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_EVENTTYPES_ACTOR_G_H)
2525
#define FDBCLIENT_EVENTTYPES_ACTOR_G_H
26-
#include "EventTypes.actor.g.h"
26+
#include "fdbclient/EventTypes.actor.g.h"
2727
#elif !defined(FDBCLIENT_EVENTTYPES_ACTOR_H)
2828
#define FDBCLIENT_EVENTTYPESS_ACTOR_H
2929

fdbclient/FDBTypes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define FDBCLIENT_FDBTYPES_H
2323

2424
#include "flow/flow.h"
25-
#include "Knobs.h"
25+
#include "fdbclient/Knobs.h"
2626

2727
using std::vector;
2828
using std::pair;

fdbclient/FailureMonitorClient.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "FailureMonitorClient.h"
21+
#include "fdbclient/FailureMonitorClient.h"
2222
#include "fdbrpc/FailureMonitor.h"
23-
#include "ClusterInterface.h"
23+
#include "fdbclient/ClusterInterface.h"
2424

2525
struct FailureMonitorClientState : ReferenceCounted<FailureMonitorClientState> {
2626
std::set<NetworkAddress> knownAddrs;

fdbclient/FileBackupAgent.actor.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "BackupAgent.h"
22-
#include "BackupContainer.h"
23-
#include "DatabaseContext.h"
24-
#include "ManagementAPI.h"
25-
#include "Status.h"
26-
#include "KeyBackedTypes.h"
21+
#include "fdbclient/BackupAgent.h"
22+
#include "fdbclient/BackupContainer.h"
23+
#include "fdbclient/DatabaseContext.h"
24+
#include "fdbclient/ManagementAPI.h"
25+
#include "fdbclient/Status.h"
26+
#include "fdbclient/KeyBackedTypes.h"
2727

2828
#include <ctime>
2929
#include <climits>

fdbclient/IClientApi.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#define FDBCLIENT_ICLIENTAPI_H
2323
#pragma once
2424

25-
#include "FDBOptions.g.h"
26-
#include "FDBTypes.h"
25+
#include "fdbclient/FDBOptions.g.h"
26+
#include "fdbclient/FDBTypes.h"
2727

2828
#include "flow/ThreadHelper.actor.h"
2929

fdbclient/JsonBuilder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "JsonBuilder.h"
1+
#include "fdbclient/JsonBuilder.h"
22
#include <iostream>
33

44
JsonBuilderObject JsonBuilder::makeMessage(const char *name, const char *description) {

fdbclient/KeyBackedTypes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <utility>
2424
#include <vector>
2525

26-
#include "ReadYourWrites.h"
27-
#include "Subspace.h"
26+
#include "fdbclient/ReadYourWrites.h"
27+
#include "fdbclient/Subspace.h"
2828
#include "flow/genericactors.actor.h"
2929

3030
// Codec is a utility struct to convert a type to and from a Tuple. It is used by the template

fdbclient/KeyRangeMap.actor.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "KeyRangeMap.h"
22-
#include "NativeAPI.h"
23-
#include "CommitTransaction.h"
24-
#include "FDBTypes.h"
25-
#include "ReadYourWrites.h"
21+
#include "fdbclient/KeyRangeMap.h"
22+
#include "fdbclient/NativeAPI.h"
23+
#include "fdbclient/CommitTransaction.h"
24+
#include "fdbclient/FDBTypes.h"
25+
#include "fdbclient/ReadYourWrites.h"
2626

2727
void KeyRangeActorMap::getRangesAffectedByInsertion( const KeyRangeRef& keys, vector< KeyRange >& affectedRanges ) {
2828
auto s = map.rangeContaining( keys.begin );

fdbclient/KeyRangeMap.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
#pragma once
2424

2525
#include "flow/flow.h"
26-
#include "FDBTypes.h"
26+
#include "fdbclient/FDBTypes.h"
2727
#include "boost/range.hpp"
2828
#include "flow/IndexedSet.h"
29-
#include "SystemData.h"
29+
#include "fdbclient/SystemData.h"
3030
#include "fdbrpc/RangeMap.h"
31-
#include "Knobs.h"
31+
#include "fdbclient/Knobs.h"
3232

3333
using boost::iterator_range;
3434

fdbclient/Knobs.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "Knobs.h"
22-
#include "FDBTypes.h"
23-
#include "SystemData.h"
21+
#include "fdbclient/Knobs.h"
22+
#include "fdbclient/FDBTypes.h"
23+
#include "fdbclient/SystemData.h"
2424

2525
ClientKnobs const* CLIENT_KNOBS = new ClientKnobs();
2626

fdbclient/ManagementAPI.actor.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "ManagementAPI.h"
21+
#include "fdbclient/ManagementAPI.h"
2222

23-
#include "SystemData.h"
24-
#include "NativeAPI.h"
25-
#include "CoordinationInterface.h"
26-
#include "DatabaseContext.h"
23+
#include "fdbclient/SystemData.h"
24+
#include "fdbclient/NativeAPI.h"
25+
#include "fdbclient/CoordinationInterface.h"
26+
#include "fdbclient/DatabaseContext.h"
2727
#include "fdbrpc/simulator.h"
28-
#include "StatusClient.h"
28+
#include "fdbclient/StatusClient.h"
2929
#include "flow/UnitTest.h"
3030
#include "fdbrpc/ReplicationPolicy.h"
3131
#include "fdbrpc/Replication.h"

fdbclient/ManagementAPI.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ standard API and some knowledge of the contents of the system key space.
3131

3232
#include <string>
3333
#include <map>
34-
#include "NativeAPI.h"
35-
#include "Status.h"
36-
#include "ReadYourWrites.h"
37-
#include "DatabaseConfiguration.h"
38-
#include "MonitorLeader.h"
34+
#include "fdbclient/NativeAPI.h"
35+
#include "fdbclient/Status.h"
36+
#include "fdbclient/ReadYourWrites.h"
37+
#include "fdbclient/DatabaseConfiguration.h"
38+
#include "fdbclient/MonitorLeader.h"
3939

4040
// ConfigurationResult enumerates normal outcomes of changeConfig() and various error
4141
// conditions specific to it. changeConfig may also throw an Error to report other problems.

fdbclient/MasterProxyInterface.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#define FDBCLIENT_MASTERPROXYINTERFACE_H
2323
#pragma once
2424

25-
#include "FDBTypes.h"
26-
#include "StorageServerInterface.h"
27-
#include "CommitTransaction.h"
25+
#include "fdbclient/FDBTypes.h"
26+
#include "fdbclient/StorageServerInterface.h"
27+
#include "fdbclient/CommitTransaction.h"
2828

2929
struct MasterProxyInterface {
3030
enum { LocationAwareLoadBalance = 1 };

fdbclient/MetricLogger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020

2121
#pragma once
2222

23-
#include "NativeAPI.h"
23+
#include "fdbclient/NativeAPI.h"
2424

2525
Future<Void> runMetrics( Future<Database> const& fcx, Key const& metricsPrefix );

fdbclient/MonitorLeader.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
* limitations under the License.
1919
*/
2020

21-
#include "MonitorLeader.h"
22-
#include "CoordinationInterface.h"
21+
#include "fdbclient/MonitorLeader.h"
22+
#include "fdbclient/CoordinationInterface.h"
2323
#include "flow/ActorCollection.h"
2424
#include "flow/UnitTest.h"
2525
#include "fdbrpc/genericactors.actor.h"

0 commit comments

Comments
 (0)