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

remove unnecessary/incorrect cleanup in DistributeBlock

This commit is contained in:
James 2014-10-23 10:09:15 +01:00
parent 6fe6cecf32
commit ef4099a8af
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arangod/Aql/ExecutionBlock.cpp
View File

@ -4201,35 +4201,7 @@ int DistributeBlock::getOrSkipSomeForShard (size_t atLeast,
freeCollector(); freeCollector();
// check if we can pop from the front of _buffer // _buffer is left intact, deleted and cleared at shutdown
size_t smallestIndex = _buffer.size();
// in case we popped everything from _distBuffer
for (size_t i = 0; i < _nrClients; i++) {
if (! _distBuffer.at(i).empty()) {
size_t index = _distBuffer.at(i).front().first;
if (index == 0) {
return TRI_ERROR_NO_ERROR; // don't have to do any clean-up
}
else {
smallestIndex = (std::min)(index, smallestIndex);
}
}
}
// pop from _buffer
for (size_t i = 0; i < smallestIndex; i++) {
AqlItemBlock* cur = _buffer.front();
delete cur;
_buffer.pop_front();
}
// reset first coord of pairs in _distBuffer
for (size_t i = 0; i < _nrClients; i++) {
for (size_t j = 0; j < _distBuffer.at(i).size(); j++) {
_distBuffer.at(i).at(j).first -= smallestIndex;
}
}
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
LEAVE_BLOCK LEAVE_BLOCK