wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing merge conflicts

This commit is contained in:
Josh Slocum 2021-10-13 16:26:44 -05:00
parent 5f0ec0612a
commit f3c44c568f
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/BlobWorkerInterface.h
View File

@ -164,7 +164,7 @@ struct GranuleStatusReply : public ReplyPromiseStreamReply {
template <class Ar>
void serialize(Ar& ar) {
serializer(ar, ReplyPromiseStreamReply::acknowledgeToken, granuleRange, doSplit, epoch, seqno);
serializer(ar, ReplyPromiseStreamReply::acknowledgeToken, ReplyPromiseStreamReply::sequence, granuleRange, doSplit, epoch, seqno);
}
};

2
fdbserver/BlobManager.actor.cpp
View File

@ -1185,7 +1185,7 @@ TEST_CASE("/blobmanager/updateranges") {
StringRef inactive = StringRef();
RangeResult dbDataEmpty;
vector<std::pair<KeyRangeRef, bool>> kbrRanges;
std::vector<std::pair<KeyRangeRef, bool>> kbrRanges;
StringRef keyA = StringRef(ar, LiteralStringRef("A"));
StringRef keyB = StringRef(ar, LiteralStringRef("B"));

2
fdbserver/BlobWorker.actor.cpp
View File

@ -1658,7 +1658,7 @@ ACTOR Future<Void> handleBlobGranuleFileRequest(Reference<BlobWorkerData> bwData
// TODO REMOVE in api V2
ASSERT(req.beginVersion == 0);
state BlobGranuleFileReply rep;
state vector<Reference<GranuleMetadata>> granules;
state std::vector<Reference<GranuleMetadata>> granules;
auto checkRanges = bwData->granuleMetadata.intersectingRanges(req.keyRange);
// check for gaps as errors and copy references to granule metadata before yielding or doing any work

4
fdbserver/Status.actor.cpp
View File

@ -725,7 +725,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
std::vector<std::pair<CommitProxyInterface, EventMap>> commitProxies,
std::vector<std::pair<GrvProxyInterface, EventMap>> grvProxies,
ServerCoordinators coordinators,
vector<BlobWorkerInterface> blobWorkers,
std::vector<BlobWorkerInterface> blobWorkers,
Database cx,
Optional<DatabaseConfiguration> configuration,
Optional<Key> healthyZone,
@ -3002,7 +3002,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
}
// ...also blob workers
state vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(cx, true));
state std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(cx, true));
wait(waitForAll(warningFutures));
} else {

6
fdbserver/workloads/BlobGranuleVerifier.actor.cpp
View File

@ -54,7 +54,7 @@ struct BlobGranuleVerifierWorkload : TestWorkload {
int64_t timeTravelReads = 0;
int64_t rowsRead = 0;
int64_t bytesRead = 0;
vector<Future<Void>> clients;
std::vector<Future<Void>> clients;
Reference<BackupContainerFileSystem> bstore;
AsyncVar<std::vector<KeyRange>> granuleRanges;
@ -404,7 +404,7 @@ struct BlobGranuleVerifierWorkload : TestWorkload {
state Version readVersion = wait(tr.getReadVersion());
state int checks = 0;
state vector<KeyRange> allRanges = self->granuleRanges.get();
state std::vector<KeyRange> allRanges = self->granuleRanges.get();
for (auto& range : allRanges) {
state KeyRange r = range;
state PromiseStream<Standalone<BlobGranuleChunkRef>> chunkStream;
@ -460,7 +460,7 @@ struct BlobGranuleVerifierWorkload : TestWorkload {
return _check(cx, this);
}
void getMetrics(vector<PerfMetric>& m) override {}
void getMetrics(std::vector<PerfMetric>& m) override {}
};
WorkloadFactory<BlobGranuleVerifierWorkload> BlobGranuleVerifierWorkloadFactory("BlobGranuleVerifier");

4
fdbserver/workloads/ConsistencyCheck.actor.cpp
View File

@ -1962,8 +1962,8 @@ struct ConsistencyCheckWorkload : TestWorkload {
DatabaseConfiguration configuration,
ConsistencyCheckWorkload* self) {
// TODO: assert that there are blob workers iff the blob gate is true
state vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(cx));
state vector<WorkerDetails> workers = wait(getWorkers(self->dbInfo));
state std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(cx));
state std::vector<WorkerDetails> workers = wait(getWorkers(self->dbInfo));
// process addr -> num blob workers on that process
state std::unordered_map<NetworkAddress, int> blobWorkersByAddr;