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

Hide in progress indexes (#8564)

This commit is contained in:
Simon 2019-03-25 18:31:12 +01:00 committed by Jan
parent 0212d56fb3
commit 75c3cadd67
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Cluster/DBServerAgencySync.cpp
View File

@ -90,7 +90,8 @@ Result DBServerAgencySync::getLocalCollections(VPackBuilder& collections) {
collections.add(VPackValue(colname));
VPackObjectBuilder col(&collections);
collection->properties(collections, /*detailed*/true, false);
collection->properties(collections, /*detailed*/true,
/*forPersistence*/false);
auto const& folls = collection->followers();
std::string const theLeader = folls->getLeader();

9
arangod/VocBase/LogicalCollection.cpp
View File

@ -641,14 +641,15 @@ arangodb::Result LogicalCollection::appendVelocyPack(arangodb::velocypack::Build
// Indexes
result.add(VPackValue("indexes"));
auto flags = Index::makeFlags();
// FIXME simon: hide links here, but increase chance of ASAN errors
/*auto filter = [&](arangodb::Index const* idx) { // hide hidden indexes
// hide hidden indexes. In effect hides unfinished indexes,
// and iResearch links (only on a single-server and coordinator)
auto filter = [&](arangodb::Index const* idx) {
return (forPersistence || !idx->isHidden());
};*/
};
if (forPersistence) {
flags = Index::makeFlags(Index::Serialize::Internals);
}
getIndexesVPack(result, flags/*, filter*/);
getIndexesVPack(result, flags, filter);
// Cluster Specific
result.add(StaticStrings::IsSmart, VPackValue(_isSmart));