From 473b58c750d51a8258ca7389e1764117e079aeba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Gra=CC=88tzer?= Date: Sat, 4 Feb 2017 00:58:53 +0100 Subject: [PATCH] Fixed some stuff --- arangod/Pregel/GraphStore.cpp | 5 ++++- arangod/Pregel/Utils.cpp | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arangod/Pregel/GraphStore.cpp b/arangod/Pregel/GraphStore.cpp index 6a6a2b99e9..e4b2aa25f6 100644 --- a/arangod/Pregel/GraphStore.cpp +++ b/arangod/Pregel/GraphStore.cpp @@ -111,6 +111,7 @@ void GraphStore::loadShards(WorkerConfig* config, _config->edgeCollectionShards(); _runningThreads = config->localVertexShardIDs().size(); + LOG(INFO) << "Using " << _runningThreads << " threads to load data"; for (auto const& pair : vertexCollMap) { std::vector const& vertexShards = pair.second; for (size_t i = 0; i < vertexShards.size(); i++) { @@ -392,6 +393,9 @@ void GraphStore::_loadEdges(Transaction* trx, auto collInfo = Utils::resolveCollection(_config->database(), collectionName, _config->collectionPlanIdMap()); + if (!collInfo) { + continue; + } // resolve the shard of the target vertex. ShardID responsibleShard; Utils::resolveShard(collInfo.get(), StaticStrings::KeyString, @@ -401,7 +405,6 @@ void GraphStore::_loadEdges(Transaction* trx, _graphFormat->copyEdgeData(document, edge.data(), sizeof(E)); if (edge._sourceShard == (prgl_shard_t)-1 || edge._targetShard == (prgl_shard_t)-1) { - LOG(ERR) << "Unknown shard"; continue; } offset++; diff --git a/arangod/Pregel/Utils.cpp b/arangod/Pregel/Utils.cpp index ce9551ed56..f4693a4d1f 100644 --- a/arangod/Pregel/Utils.cpp +++ b/arangod/Pregel/Utils.cpp @@ -100,8 +100,9 @@ std::shared_ptr Utils::resolveCollection( if (it != collectionPlanIdMap.end()) { return ci->getCollection(database, it->second); } - THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, - "The collection could not be translated to a planID"); + LOG(INFO) << "The collection could not be translated to a planID"; + //THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, + // "The collection could not be translated to a planID"); return std::shared_ptr(); }