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

only clone complex AQL values in SortBlock and GatherBlock (#5253)

This commit is contained in:
Jan 2018-05-07 10:53:07 +02:00 committed by GitHub
parent b69b5bdfdf
commit 973220e1ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 83 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arangod/Aql/ClusterBlocks.cpp
View File

@ -342,19 +342,25 @@ AqlItemBlock* GatherBlock::getSome(size_t atMost) {
TRI_ASSERT(!_gatherBlockBuffer[val.first].empty()); TRI_ASSERT(!_gatherBlockBuffer[val.first].empty());
AqlValue const& x(_gatherBlockBuffer[val.first].front()->getValueReference(val.second, col)); AqlValue const& x(_gatherBlockBuffer[val.first].front()->getValueReference(val.second, col));
if (!x.isEmpty()) { if (!x.isEmpty()) {
auto it = cache[val.first].find(x); if (x.requiresDestruction()) {
// complex value, with ownership transfer
auto it = cache[val.first].find(x);
if (it == cache[val.first].end()) { if (it == cache[val.first].end()) {
AqlValue y = x.clone(); AqlValue y = x.clone();
try { try {
res->setValue(i, col, y); res->setValue(i, col, y);
} catch (...) { } catch (...) {
y.destroy(); y.destroy();
throw; throw;
}
cache[val.first].emplace(x, y);
} else {
res->setValue(i, col, (*it).second);
} }
cache[val.first].emplace(x, y);
} else { } else {
res->setValue(i, col, (*it).second); // simple value, no ownership transfer needed
res->setValue(i, col, x);
} }
} }
} }

118
arangod/Aql/SortBlock.cpp
View File

@ -331,62 +331,78 @@ void SortBlock::doSorting() {
// If we have already dealt with this value for the next // If we have already dealt with this value for the next
// block, then we just put the same value again: // block, then we just put the same value again:
if (!a.isEmpty()) { if (!a.isEmpty()) {
auto it = cache.find(a); if (a.requiresDestruction()) {
// complex value, with ownership transfer
auto it = cache.find(a);
if (it != cache.end()) { if (it != cache.end()) {
// If one of the following throws, all is well, because // If one of the following throws, all is well, because
// the new block already has either a copy or stolen // the new block already has either a copy or stolen
// the AqlValue: // the AqlValue:
_buffer[coords[count].first]->eraseValue(coords[count].second, j);
next->setValue(i, j, (*it).second);
} else {
// We need to copy a, if it has already been stolen from
// its original buffer, which we know by looking at the
// valueCount there.
auto vCount = _buffer[coords[count].first]->valueCount(a);
if (vCount == 0) {
// Was already stolen for another block
AqlValue b = a.clone();
try {
TRI_IF_FAILURE("SortBlock::doSortingCache") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
cache.emplace(a, b);
} catch (...) {
b.destroy();
throw;
}
try {
TRI_IF_FAILURE("SortBlock::doSortingNext1") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
next->setValue(i, j, b);
} catch (...) {
cache.erase(b);
b.destroy();
throw;
}
// It does not matter whether the following works or not,
// since the original block keeps its responsibility
// for a:
_buffer[coords[count].first]->eraseValue(coords[count].second, j); _buffer[coords[count].first]->eraseValue(coords[count].second, j);
next->setValue(i, j, (*it).second);
} else { } else {
TRI_IF_FAILURE("SortBlock::doSortingNext2") { // We need to copy a, if it has already been stolen from
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG); // its original buffer, which we know by looking at the
// valueCount there.
auto vCount = _buffer[coords[count].first]->valueCount(a);
if (vCount == 0) {
// Was already stolen for another block
AqlValue b = a.clone();
try {
TRI_IF_FAILURE("SortBlock::doSortingCache") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
cache.emplace(a, b);
} catch (...) {
b.destroy();
throw;
}
try {
TRI_IF_FAILURE("SortBlock::doSortingNext1") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
next->setValue(i, j, b);
} catch (...) {
cache.erase(b);
b.destroy();
throw;
}
// It does not matter whether the following works or not,
// since the original block keeps its responsibility
// for a:
_buffer[coords[count].first]->eraseValue(coords[count].second, j);
} else {
TRI_IF_FAILURE("SortBlock::doSortingNext2") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
// Here we are the first to want to inherit a, so we
// steal it:
next->setValue(i, j, a);
_buffer[coords[count].first]->steal(a);
_buffer[coords[count].first]->eraseValue(coords[count].second, j);
// If this has worked, responsibility is now with the
// new block or indeed with us!
// If the following does not work, we will create a
// few unnecessary copies, but this does not matter:
cache.emplace(a, a);
} }
// Here we are the first to want to inherit a, so we
// steal it:
next->setValue(i, j, a);
_buffer[coords[count].first]->steal(a);
_buffer[coords[count].first]->eraseValue(coords[count].second, j);
// If this has worked, responsibility is now with the
// new block or indeed with us!
// If the following does not work, we will create a
// few unnecessary copies, but this does not matter:
cache.emplace(a, a);
} }
} else {
// simple value, which does not need ownership transfer
TRI_IF_FAILURE("SortBlock::doSortingCache") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
TRI_IF_FAILURE("SortBlock::doSortingNext1") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
TRI_IF_FAILURE("SortBlock::doSortingNext2") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
next->setValue(i, j, a);
_buffer[coords[count].first]->eraseValue(coords[count].second, j);
} }
} }
} }