mirror of https://gitee.com/bigwinds/arangodb
fixed AggregatorGroup shutdown
This commit is contained in:
parent
0f2cd7211b
commit
dacc249105
|
@ -55,6 +55,19 @@ using StringBuffer = triagens::basics::StringBuffer;
|
|||
// -----------------------------------------------------------------------------
|
||||
// --SECTION-- struct AggregatorGroup
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
AggregatorGroup::AggregatorGroup ()
|
||||
: firstRow(0),
|
||||
lastRow(0),
|
||||
rowsAreValid(false) {
|
||||
}
|
||||
|
||||
AggregatorGroup::~AggregatorGroup () {
|
||||
//reset();
|
||||
for (auto it = groupBlocks.begin(); it != groupBlocks.end(); ++it) {
|
||||
delete (*it);
|
||||
}
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// --SECTION-- public methods
|
||||
|
@ -2389,11 +2402,11 @@ int AggregateBlock::getOrSkipSome (size_t atLeast,
|
|||
_currentGroup.collections[i] = cur->getDocumentCollection((*it).second);
|
||||
++i;
|
||||
}
|
||||
if(! skipping){
|
||||
if (! skipping) {
|
||||
_currentGroup.setFirstRow(_pos);
|
||||
}
|
||||
}
|
||||
if(! skipping){
|
||||
if (! skipping) {
|
||||
_currentGroup.setLastRow(_pos);
|
||||
}
|
||||
|
||||
|
|
|
@ -65,15 +65,9 @@ namespace triagens {
|
|||
size_t lastRow;
|
||||
bool rowsAreValid;
|
||||
|
||||
AggregatorGroup ()
|
||||
: firstRow(0),
|
||||
lastRow(0),
|
||||
rowsAreValid(false) {
|
||||
}
|
||||
AggregatorGroup ();
|
||||
|
||||
~AggregatorGroup () {
|
||||
reset();
|
||||
}
|
||||
~AggregatorGroup ();
|
||||
|
||||
void initialize (size_t capacity);
|
||||
void reset ();
|
||||
|
|
Loading…
Reference in New Issue