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

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

This commit is contained in:
Jan Steemann 2016-03-21 17:08:57 +01:00
parent f0724447b6 34b6b85a4b
commit 910d620c7d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/Indexes/Index.cpp
View File

@ -644,8 +644,16 @@ void Index::expandInSearchValues(VPackSlice const base,
VPackSlice current = oneLookup.at(i);
if (current.hasKey(TRI_SLICE_KEY_IN)) {
std::unordered_set<VPackSlice> tmp;
TRI_ASSERT(current.get(TRI_SLICE_KEY_IN).isArray());
for (auto const& el : VPackArrayIterator(current.get(TRI_SLICE_KEY_IN))) {
VPackSlice inList = current.get(TRI_SLICE_KEY_IN);
TRI_ASSERT(inList.isArray());
if (inList.length() == 0) {
// Empty Array. short circuit, no matches possible
result.clear();
result.openArray();
result.close();
return;
}
for (auto const& el : VPackArrayIterator(inList)) {
tmp.emplace(el);
}
auto& vector = elements[i];

4
arangod/Indexes/PrimaryIndex.cpp
View File

@ -114,7 +114,9 @@ TRI_doc_mptr_t* AnyIndexIterator::next() {
}
void AnyIndexIterator::reset() {
THROW_ARANGO_EXCEPTION(TRI_ERROR_NOT_IMPLEMENTED);
_step = 0;
_total = 0;
_position = _initial;
}