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

Bug fix 3.4/little weekend fix (#10526) 

* create arena before using it

* try to avoid oom situation
This commit is contained in:
Jan Christoph Uhde 2019-11-26 10:13:52 +01:00 committed by KVS85
parent c4a4f6154d
commit 06cb81be3d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/MMFiles/MMFilesHashIndex.cpp
View File

@ -52,6 +52,7 @@ MMFilesHashIndexLookupBuilder::MMFilesHashIndexLookupBuilder(
: _builder(trx),
_usesIn(false),
_isEmpty(false),
_mappingFieldConditionArena(),
_mappingFieldCondition{_mappingFieldConditionArena},
_inStorage(trx) {
TRI_ASSERT(node->type == aql::NODE_TYPE_OPERATOR_NARY_AND);

6
arangod/MMFiles/MMFilesHashIndex.h
View File

@ -179,8 +179,10 @@ class MMFilesHashIndexLookupBuilder {
bool _isEmpty;
size_t _coveredFields;
SmallVector<arangodb::aql::AstNode const*> _mappingFieldCondition;
SmallVector<arangodb::aql::AstNode const*>::allocator_type::arena_type _mappingFieldConditionArena;
using MappingCondition =
SmallVector<arangodb::aql::AstNode const*>;
MappingCondition::allocator_type::arena_type _mappingFieldConditionArena;
MappingCondition _mappingFieldCondition;
std::unordered_map<size_t, std::pair<size_t, std::vector<arangodb::velocypack::Slice>>> _inPosition;
transaction::BuilderLeaser _inStorage;

5
arangod/MMFiles/MMFilesPrimaryIndex.cpp
View File

@ -21,8 +21,11 @@
/// @author Dr. Frank Celler
////////////////////////////////////////////////////////////////////////////////
#include <algorithm>
#include "MMFilesPrimaryIndex.h"
#include "Aql/AstNode.h"
#include "Aql/ExecutionBlock.h"
#include "Basics/Exceptions.h"
#include "Basics/StaticStrings.h"
#include "Basics/hashes.h"
@ -162,7 +165,7 @@ bool MMFilesAllIndexIterator::next(LocalDocumentIdCallback const& cb, size_t lim
bool MMFilesAllIndexIterator::nextDocument(DocumentCallback const& cb, size_t limit) {
_documentIds.clear();
_documentIds.reserve(limit);
_documentIds.reserve((std::min)(limit, aql::ExecutionBlock::DefaultBatchSize()));
bool done = false;
while (limit > 0) {