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

Fixed some stuff

This commit is contained in:
Simon Grätzer 2017-02-04 00:58:53 +01:00
parent 63dfe865ba
commit 473b58c750
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Pregel/GraphStore.cpp
View File

@ -111,6 +111,7 @@ void GraphStore<V, E>::loadShards(WorkerConfig* config,
_config->edgeCollectionShards(); _config->edgeCollectionShards();
_runningThreads = config->localVertexShardIDs().size(); _runningThreads = config->localVertexShardIDs().size();
LOG(INFO) << "Using " << _runningThreads << " threads to load data";
for (auto const& pair : vertexCollMap) { for (auto const& pair : vertexCollMap) {
std::vector<ShardID> const& vertexShards = pair.second; std::vector<ShardID> const& vertexShards = pair.second;
for (size_t i = 0; i < vertexShards.size(); i++) { for (size_t i = 0; i < vertexShards.size(); i++) {
@ -392,6 +393,9 @@ void GraphStore<V, E>::_loadEdges(Transaction* trx,
auto collInfo = auto collInfo =
Utils::resolveCollection(_config->database(), collectionName, Utils::resolveCollection(_config->database(), collectionName,
_config->collectionPlanIdMap()); _config->collectionPlanIdMap());
if (!collInfo) {
continue;
}
// resolve the shard of the target vertex. // resolve the shard of the target vertex.
ShardID responsibleShard; ShardID responsibleShard;
Utils::resolveShard(collInfo.get(), StaticStrings::KeyString, Utils::resolveShard(collInfo.get(), StaticStrings::KeyString,
@ -401,7 +405,6 @@ void GraphStore<V, E>::_loadEdges(Transaction* trx,
_graphFormat->copyEdgeData(document, edge.data(), sizeof(E)); _graphFormat->copyEdgeData(document, edge.data(), sizeof(E));
if (edge._sourceShard == (prgl_shard_t)-1 || if (edge._sourceShard == (prgl_shard_t)-1 ||
edge._targetShard == (prgl_shard_t)-1) { edge._targetShard == (prgl_shard_t)-1) {
LOG(ERR) << "Unknown shard";
continue; continue;
} }
offset++; offset++;

5
arangod/Pregel/Utils.cpp
View File

@ -100,8 +100,9 @@ std::shared_ptr<LogicalCollection> Utils::resolveCollection(
if (it != collectionPlanIdMap.end()) { if (it != collectionPlanIdMap.end()) {
return ci->getCollection(database, it->second); return ci->getCollection(database, it->second);
} }
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, LOG(INFO) << "The collection could not be translated to a planID";
"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<LogicalCollection>(); return std::shared_ptr<LogicalCollection>();
} }