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

Bug fix/dont fail when restoring cluster dump into single server (#7598)

This commit is contained in:
Jan 2018-12-03 16:18:07 +01:00 committed by GitHub
parent 056363a3b3
commit 7b93b1c8f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/Indexes/IndexFactory.cpp
View File

@ -228,8 +228,13 @@ TRI_idx_iid_t IndexFactory::validateSlice(arangodb::velocypack::Slice info,
if (iid == 0 && !isClusterConstructor) { if (iid == 0 && !isClusterConstructor) {
// Restore is not allowed to generate an id // Restore is not allowed to generate an id
TRI_ASSERT(generateKey); VPackSlice type = info.get(StaticStrings::IndexType);
iid = arangodb::Index::generateId(); // dont generate ids for indexes of type "primary"
// id 0 is expected for primary indexes
if (!type.isString() || !type.isEqualString("primary")) {
TRI_ASSERT(generateKey);
iid = arangodb::Index::generateId();
}
} }
return iid; return iid;