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

fix ms compilation (#5566)

This commit is contained in:
Andrey Abramov 2018-06-08 17:40:51 +03:00 committed by GitHub
parent af9d2c05bc
commit 153d25d3ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arangod/Aql/EngineInfoContainerDBServer.cpp
View File

@ -355,11 +355,10 @@ void EngineInfoContainerDBServer::addNode(ExecutionNode* node) {
auto const& colNode = *ExecutionNode::castTo<EnumerateCollectionNode const*>(node);
auto const* col = colNode.collection();
std::unordered_set<std::string> const restrictedShard(
colNode.isRestricted()
? std::initializer_list<std::string>{ colNode.restrictedShard() }
: std::initializer_list<std::string>{ }
);
std::unordered_set<std::string> restrictedShard;
if (colNode.isRestricted()) {
restrictedShard.emplace(colNode.restrictedShard());
}
handleCollection(col, AccessMode::Type::READ, scatter, restrictedShard);
updateCollection(col);
@ -371,11 +370,10 @@ void EngineInfoContainerDBServer::addNode(ExecutionNode* node) {
auto const& idxNode = *ExecutionNode::castTo<IndexNode const*>(node);
auto const* col = idxNode.collection();
std::unordered_set<std::string> const restrictedShard(
idxNode.isRestricted()
? std::initializer_list<std::string>{ idxNode.restrictedShard() }
: std::initializer_list<std::string>{ }
);
std::unordered_set<std::string> restrictedShard;
if (idxNode.isRestricted()) {
restrictedShard.emplace(idxNode.restrictedShard());
}
handleCollection(col, AccessMode::Type::READ, scatter, restrictedShard);
updateCollection(col);
@ -411,11 +409,10 @@ void EngineInfoContainerDBServer::addNode(ExecutionNode* node) {
auto const& modNode = *ExecutionNode::castTo<ModificationNode const*>(node);
auto const* col = modNode.collection();
std::unordered_set<std::string> const restrictedShard(
modNode.isRestricted()
? std::initializer_list<std::string>{ modNode.restrictedShard() }
: std::initializer_list<std::string>{ }
);
std::unordered_set<std::string> restrictedShard;
if (modNode.isRestricted()) {
restrictedShard.emplace(modNode.restrictedShard());
}
handleCollection(col, AccessMode::Type::WRITE, scatter, restrictedShard);
updateCollection(col);