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

Avoid calling setCachedLocation twice

This commit is contained in:
Yichi Chiang 2017-08-08 10:03:04 -07:00
parent 47a37f3f1e
commit aac82074af
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbclient/NativeAPI.actor.cpp
View File

@ -1116,16 +1116,19 @@ ACTOR Future< pair<KeyRange,Reference<LocationInfo>> > getKeyLocation( Database
g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getKeyLocation.After"); g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getKeyLocation.After");
ASSERT( keyServersShards.size() ); // There should always be storage servers, except on version 0 which should not get to this function ASSERT( keyServersShards.size() ); // There should always be storage servers, except on version 0 which should not get to this function
Reference<LocationInfo> cachedLocation;
for (pair<KeyRangeRef, vector<StorageServerInterface>> keyServersShard : keyServersShards) { for (pair<KeyRangeRef, vector<StorageServerInterface>> keyServersShard : keyServersShards) {
cx->setCachedLocation(keyServersShard.first, keyServersShard.second); auto locationInfo = cx->setCachedLocation(keyServersShard.first, keyServersShard.second);
if (isBackward ? (keyServersShard.first.begin < key && keyServersShard.first.end >= key) : keyServersShard.first.contains(key)) { if (isBackward ? (keyServersShard.first.begin < key && keyServersShard.first.end >= key) : keyServersShard.first.contains(key)) {
range = keyServersShard.first; range = keyServersShard.first;
serverInterfaces = keyServersShard.second; cachedLocation = locationInfo;
} }
} }
break; ASSERT(isBackward ? (range.begin < key && range.end >= key) : range.contains(key));
return make_pair(range, cachedLocation);
} }
} }
} }