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

Removed unnecessary TRI_json_t in RestReplicationHandler

This commit is contained in:
Michael Hackstein 2016-04-16 22:37:48 +02:00
parent 5ba68d76e5
commit 1c040696b4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -2286,9 +2286,7 @@ void RestReplicationHandler::handleCommandRestoreDataCoordinator() {
if (!doc.isNone() && type != REPLICATION_MARKER_REMOVE) { if (!doc.isNone() && type != REPLICATION_MARKER_REMOVE) {
ShardID responsibleShard; ShardID responsibleShard;
bool usesDefaultSharding; bool usesDefaultSharding;
std::unique_ptr<TRI_json_t> tmp( res = ci->getResponsibleShard(col->id_as_string(), doc, true,
arangodb::basics::VelocyPackHelper::velocyPackToJson(doc));
res = ci->getResponsibleShard(col->id_as_string(), tmp.get(), true,
responsibleShard, usesDefaultSharding); responsibleShard, usesDefaultSharding);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
errorMsg = "error during determining responsible shard"; errorMsg = "error during determining responsible shard";

2
arangod/RestHandler/RestReplicationHandler.h
View File

@ -27,12 +27,12 @@
#include "Basics/Common.h" #include "Basics/Common.h"
#include "RestHandler/RestVocbaseBaseHandler.h" #include "RestHandler/RestVocbaseBaseHandler.h"
#include "Utils/CollectionNameResolver.h"
#include "VocBase/replication-common.h" #include "VocBase/replication-common.h"
class TRI_vocbase_col_t; class TRI_vocbase_col_t;
namespace arangodb { namespace arangodb {
class CollectionNameResolver;
class Transaction; class Transaction;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////