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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2018-07-30 19:27:36 +02:00
parent efa5e8faa3 0e9e700656
commit c0773691c6
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arangod/Sharding/ShardingStrategyDefault.cpp
View File

@ -154,18 +154,20 @@ uint64_t ShardingStrategyCommunityCompat::hashByAttributes(
if (slice.isObject()) { if (slice.isObject()) {
for (auto const& attr : attributes) { for (auto const& attr : attributes) {
VPackSlice sub = slice.get(attr).resolveExternal(); VPackSlice sub = slice.get(attr).resolveExternal();
VPackBuilder tempBuilder;
if (sub.isNone()) { if (sub.isNone()) {
if (attr == StaticStrings::KeyString && !key.empty()) { if (attr == StaticStrings::KeyString && !key.empty()) {
VPackBuilder tempBuilder;
tempBuilder.add(VPackValue(key)); tempBuilder.add(VPackValue(key));
sub = tempBuilder.slice(); sub = tempBuilder.slice();
} else { hash = sub.normalizedHash(hash);
if (!docComplete) { continue;
error = TRI_ERROR_CLUSTER_NOT_ALL_SHARDING_ATTRIBUTES_GIVEN;
}
// Null is equal to None/not present
sub = VPackSlice::nullSlice();
} }
if (!docComplete) {
error = TRI_ERROR_CLUSTER_NOT_ALL_SHARDING_ATTRIBUTES_GIVEN;
}
// Null is equal to None/not present
sub = VPackSlice::nullSlice();
} }
hash = sub.normalizedHash(hash); hash = sub.normalizedHash(hash);
} }

25
js/server/tests/aql/aql-shardids-cluster.js
View File

@ -252,7 +252,12 @@ function ahuacatlShardIdsOptimizationTestSuite() {
FILTER joined.joinValue == doc.joinValue FILTER joined.joinValue == doc.joinValue
RETURN [doc, joined] RETURN [doc, joined]
`; `;
validatePlan(query, "IndexNode", collectionByKey);
const isEnterprise = require("internal").isEnterprise();
if (isEnterprise) {
// enterprise distributes all numeric keys onto one shard
validatePlan(query, "IndexNode", collectionByKey);
}
let res = db._query(query).toArray(); let res = db._query(query).toArray();
// we find 4 in first Loop, and 4 joins each // we find 4 in first Loop, and 4 joins each
assertEqual(16, res.length); assertEqual(16, res.length);
@ -263,6 +268,24 @@ function ahuacatlShardIdsOptimizationTestSuite() {
} }
} }
}, },
testRestrictMultipleShardsStringKeys : function () {
dropIndexes(collectionByKey);
collectionByKey.ensureHashIndex(shardKey);
for (let i = 0; i < 25; ++i) {
const query = `
FOR doc IN ${cnKey}
FILTER doc.${shardKey} == "key${i}"
FOR joined IN ${cnKey}
FILTER joined.${shardKey} == "key${i}"
FILTER joined.joinValue == doc.joinValue
RETURN [doc, joined]
`;
validatePlan(query, "IndexNode", collectionByKey);
}
},
/* Not supported yet /* Not supported yet
testRestrictOnShardKeyNoIndex : function () { testRestrictOnShardKeyNoIndex : function () {