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

fix test (#5618)

This commit is contained in:
Jan 2018-06-15 15:53:23 +02:00 committed by GitHub
parent 23667d0308
commit 8a25558e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arangod/Cluster/ClusterMethods.cpp
View File

@ -319,8 +319,19 @@ static int distributeBabyOnShards(
// Now find the responsible shard: // Now find the responsible shard:
bool usesDefaultShardingAttributes; bool usesDefaultShardingAttributes;
ShardID shardID; ShardID shardID;
int error = ci->getResponsibleShard(collinfo.get(), value, false, shardID, int error;
usesDefaultShardingAttributes); if (value.isString()) {
VPackBuilder temp;
temp.openObject();
temp.add(StaticStrings::KeyString, value);
temp.close();
error = ci->getResponsibleShard(collinfo.get(), temp.slice(), false, shardID,
usesDefaultShardingAttributes);
} else {
error = ci->getResponsibleShard(collinfo.get(), value, false, shardID,
usesDefaultShardingAttributes);
}
if (error == TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND) { if (error == TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND) {
return TRI_ERROR_CLUSTER_SHARD_GONE; return TRI_ERROR_CLUSTER_SHARD_GONE;
} }
@ -1612,23 +1623,10 @@ int getDocumentOnCoordinator(
std::vector<std::pair<ShardID, VPackValueLength>> reverseMapping; std::vector<std::pair<ShardID, VPackValueLength>> reverseMapping;
bool useMultiple = slice.isArray(); bool useMultiple = slice.isArray();
VPackBuilder tempBuilder;
int res = TRI_ERROR_NO_ERROR; int res = TRI_ERROR_NO_ERROR;
bool canUseFastPath = true; bool canUseFastPath = true;
if (useMultiple) { if (useMultiple) {
for (VPackSlice value : VPackArrayIterator(slice)) { for (VPackSlice value : VPackArrayIterator(slice)) {
// if the input is not a document object but a string,
// we will construct a new object on the fly with just
// the "_key" attribute. this is necessary because
// distributeBabyOnShards prefers this format for finding
// out the responsible shard for the document
if (value.isString()) {
tempBuilder.clear();
tempBuilder.openObject();
tempBuilder.add(StaticStrings::KeyString, value);
tempBuilder.close();
value = tempBuilder.slice();
}
res = distributeBabyOnShards(shardMap, ci, collid, collinfo, res = distributeBabyOnShards(shardMap, ci, collid, collinfo,
reverseMapping, value); reverseMapping, value);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
@ -1639,17 +1637,6 @@ int getDocumentOnCoordinator(
} }
} }
} else { } else {
// if the input is not a document object but a string,
// we will construct a new object on the fly with just
// the "_key" attribute. this is necessary because
// distributeBabyOnShards prefers this format for finding
// out the responsible shard for the document
if (slice.isString()) {
tempBuilder.openObject();
tempBuilder.add(StaticStrings::KeyString, slice);
tempBuilder.close();
slice = tempBuilder.slice();
}
res = distributeBabyOnShards(shardMap, ci, collid, collinfo, reverseMapping, res = distributeBabyOnShards(shardMap, ci, collid, collinfo, reverseMapping,
slice); slice);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {