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

Merge pull request #1860 from alexmiller-apple/comma-operator 

Remove `operator , (vector<T>, T)` as an append operator.
This commit is contained in:
Jingyu Zhou 2019-07-19 12:53:32 -07:00 committed by GitHub
parent f6183df8b9 9863ace96c
commit 8e9aaa767e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/OldTLogServer_4_6.actor.cpp
View File

@ -1240,8 +1240,8 @@ namespace oldTLog_4_6 {
// FIXME: metadata in queue?
wait( waitForAll( (vector<Future<Optional<Value>>>(), fFormat ) ) );
wait( waitForAll( (vector<Future<Standalone<VectorRef<KeyValueRef>>>>(), fVers, fRecoverCounts) ) );
wait( waitForAll( std::vector{fFormat} ) );
wait( waitForAll( std::vector{fVers, fRecoverCounts} ) );
if (fFormat.get().present() && !persistFormatReadableRange.contains( fFormat.get().get() )) {
TraceEvent(SevError, "UnsupportedDBFormat", self->dbgid).detail("Format", fFormat.get().get()).detail("Expected", persistFormat.value.toString());

4
fdbserver/OldTLogServer_6_0.actor.cpp
View File

@ -2061,8 +2061,8 @@ ACTOR Future<Void> restorePersistentState( TLogData* self, LocalityData locality
// FIXME: metadata in queue?
wait( waitForAll( (vector<Future<Optional<Value>>>(), fFormat ) ) );
wait( waitForAll( (vector<Future<Standalone<VectorRef<KeyValueRef>>>>(), fVers, fKnownCommitted, fLocality, fLogRouterTags, fTxsTags, fRecoverCounts) ) );
wait( waitForAll( std::vector{fFormat} ) );
wait( waitForAll( std::vector{fVers, fKnownCommitted, fLocality, fLogRouterTags, fTxsTags, fRecoverCounts} ) );
if (fFormat.get().present() && !persistFormatReadableRange.contains( fFormat.get().get() )) {
//FIXME: remove when we no longer need to test upgrades from 4.X releases

4
fdbserver/TLogServer.actor.cpp
View File

@ -2451,8 +2451,8 @@ ACTOR Future<Void> restorePersistentState( TLogData* self, LocalityData locality
// FIXME: metadata in queue?
wait( waitForAll( (vector<Future<Optional<Value>>>(), fFormat, fRecoveryLocation ) ) );
wait( waitForAll( (vector<Future<Standalone<VectorRef<KeyValueRef>>>>(), fVers, fKnownCommitted, fLocality, fLogRouterTags, fTxsTags, fRecoverCounts, fProtocolVersions ) ) );
wait( waitForAll( std::vector{fFormat, fRecoveryLocation} ) );
wait( waitForAll( std::vector{fVers, fKnownCommitted, fLocality, fLogRouterTags, fTxsTags, fRecoverCounts, fProtocolVersions} ) );
if (fFormat.get().present() && !persistFormatReadableRange.contains( fFormat.get().get() )) {
//FIXME: remove when we no longer need to test upgrades from 4.X releases

4
fdbserver/storageserver.actor.cpp
View File

@ -3149,8 +3149,8 @@ ACTOR Future<bool> restoreDurableState( StorageServer* data, IKeyValueStore* sto
data->byteSampleRecovery = restoreByteSample(data, storage, byteSampleSampleRecovered, startByteSampleRestore.getFuture());
TraceEvent("ReadingDurableState", data->thisServerID);
wait( waitForAll( (vector<Future<Optional<Value>>>(), fFormat, fID, fVersion, fLogProtocol, fPrimaryLocality) ) );
wait( waitForAll( (vector<Future<Standalone<VectorRef<KeyValueRef>>>>(), fShardAssigned, fShardAvailable) ) );
wait( waitForAll( std::vector{ fFormat, fID, fVersion, fLogProtocol, fPrimaryLocality } ) );
wait( waitForAll( std::vector{ fShardAssigned, fShardAvailable } ) );
wait( byteSampleSampleRecovered.getFuture() );
TraceEvent("RestoringDurableState", data->thisServerID);

11
flow/genericactors.actor.h
View File

@ -89,17 +89,6 @@ T sorted(T range) {
return range;
}
template <class T>
inline std::vector<T>& operator , (std::vector<T>& v, T a) {
v.push_back(a);
return v;
}
template <class T>
inline std::vector<T>& operator , (std::vector<T> && v, T a) {
return (const_cast<std::vector<T>&>(v), a);
}
template <class T>
ErrorOr<T> errorOr( T t ) {
return ErrorOr<T>(t);