From aff77dea414cd35e7d0d104ea59c366ec42230a4 Mon Sep 17 00:00:00 2001 From: Andreas Streichardt Date: Fri, 25 Nov 2016 13:26:28 +0100 Subject: [PATCH] Fix replicationFactor: -1 almost endless loop --- arangod/VocBase/LogicalCollection.cpp | 4 ++-- arangod/VocBase/LogicalCollection.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arangod/VocBase/LogicalCollection.cpp b/arangod/VocBase/LogicalCollection.cpp index 6b5503122f..f114a6887c 100644 --- a/arangod/VocBase/LogicalCollection.cpp +++ b/arangod/VocBase/LogicalCollection.cpp @@ -381,7 +381,7 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, _version(ReadNumericValue(info, "version", currentVersion())), _indexBuckets(ReadNumericValue( info, "indexBuckets", DatabaseFeature::defaultIndexBuckets())), - _replicationFactor(ReadNumericValue(info, "replicationFactor", 1)), + _replicationFactor(ReadNumericValue(info, "replicationFactor", 1)), _numberOfShards(ReadNumericValue(info, "numberOfShards", 1)), _allowUserKeys(ReadBooleanValue(info, "allowUserKeys", true)), _shardIds(new ShardMap()), @@ -870,7 +870,7 @@ void LogicalCollection::getIndexesVPack(VPackBuilder& result, // SECTION: Replication int LogicalCollection::replicationFactor() const { - return _replicationFactor; + return static_cast(_replicationFactor); } // SECTION: Sharding diff --git a/arangod/VocBase/LogicalCollection.h b/arangod/VocBase/LogicalCollection.h index 830386c47e..acaa9a398e 100644 --- a/arangod/VocBase/LogicalCollection.h +++ b/arangod/VocBase/LogicalCollection.h @@ -540,7 +540,7 @@ class LogicalCollection { std::vector> _indexes; // SECTION: Replication - int const _replicationFactor; + size_t const _replicationFactor; // SECTION: Sharding size_t _numberOfShards;