Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix unused variables

This commit is contained in:
Andreas Streichardt 2016-05-09 16:25:20 +02:00
parent 64c8c2d8ae
commit a69e7808c2
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Cluster/ClusterInfo.cpp
View File

@ -1547,7 +1547,6 @@ int ClusterInfo::ensureIndexCoordinator(
"Plan/Collections/" + databaseName + "/" + collectionID; "Plan/Collections/" + databaseName + "/" + collectionID;
AgencyCommResult previous = ac.getValues2(key); AgencyCommResult previous = ac.getValues2(key);
bool usePrevious = true;
velocypack::Slice collection = velocypack::Slice collection =
previous.slice()[0].get(std::vector<std::string>( previous.slice()[0].get(std::vector<std::string>(
@ -1676,11 +1675,7 @@ int ClusterInfo::ensureIndexCoordinator(
} }
AgencyCommResult result; AgencyCommResult result;
if (usePrevious) {
result = ac.casValue(key, collection, newBuilder.slice(), 0.0, 0.0); result = ac.casValue(key, collection, newBuilder.slice(), 0.0, 0.0);
} else { // only when there is no previous value
result = ac.setValue(key, newBuilder.slice(), 0.0);
}
if (!result.successful()) { if (!result.successful()) {
return setErrormsg(TRI_ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN, return setErrormsg(TRI_ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN,

2
arangod/Cluster/ClusterInfo.h
View File

@ -329,7 +329,7 @@ class CollectionInfo {
for (auto const& serverSlice: VPackArrayIterator(shardSlice.value)) { for (auto const& serverSlice: VPackArrayIterator(shardSlice.value)) {
servers.push_back(serverSlice.copyString()); servers.push_back(serverSlice.copyString());
} }
(*res).insert(make_pair(shardSlice.key.copyString(), servers)); (*res).insert(make_pair(shard, servers));
} }
} }
} }