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

Fixed now false checks on planId == 0 for SingleServer case. This is not true any more

This commit is contained in:
Michael Hackstein 2016-08-30 15:37:26 +02:00
parent 09b611100c
commit 277953489c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -1361,11 +1361,7 @@ int RestReplicationHandler::createCollection(VPackSlice const& slice,
planId = static_cast<TRI_voc_cid_t>(StringUtils::uint64(tmp));
}
if (planId > 0) {
TRI_ASSERT(col->planId() == planId);
} else {
TRI_ASSERT(col->planId() == 0);
}
TRI_ASSERT(col->planId() == planId);
if (dst != nullptr) {

2
arangod/Utils/CollectionNameResolver.cpp
View File

@ -264,7 +264,7 @@ std::string CollectionNameResolver::localNameLookup(TRI_voc_cid_t cid) const {
auto it = _vocbase->_collectionsById.find(cid);
if (it != _vocbase->_collectionsById.end()) {
if ((*it).second->planId() == 0) {
if ((*it).second->planId() != (*it).second->cid()) {
// DBserver local case
name = (*it).second->name();
} else {